diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-04-06 13:46:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 13:46:22 +0200 |
| commit | bcf73f5e403c1e500da42c8166f13a4d16a94d9b (patch) | |
| tree | 595006abfb0b0f76b2f0c5c4b3732b36642d4829 /flags | |
| parent | add6a3461d6df1fe8693f88ddf9dd528273dffb2 (diff) | |
| parent | bd5f5706230d01245eb41cfe42657ce4541e7ead (diff) | |
Merge pull request #17276 from vespa-engine/hmusum/change-tls-zk-default-flag-values
Update default values for ZooKeeper TLS flags
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 89afda75c1d..7c3fb097e2b 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -110,14 +110,14 @@ public class Flags { ZONE_ID, APPLICATION_ID); public static final UnboundStringFlag TLS_FOR_ZOOKEEPER_CLIENT_SERVER_COMMUNICATION = defineStringFlag( - "tls-for-zookeeper-client-server-communication", "OFF", + "tls-for-zookeeper-client-server-communication", "TLS_WITH_PORT_UNIFICATION", List.of("hmusum"), "2020-12-02", "2021-06-01", "How to setup TLS for ZooKeeper client/server communication. Valid values are OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIFICATION, TLS_ONLY", "Takes effect on restart of config server", NODE_TYPE, HOSTNAME); public static final UnboundBooleanFlag USE_TLS_FOR_ZOOKEEPER_CLIENT = defineFeatureFlag( - "use-tls-for-zookeeper-client", false, + "use-tls-for-zookeeper-client", true, List.of("hmusum"), "2020-12-02", "2021-05-01", "Whether to use TLS for ZooKeeper clients", "Takes effect on restart of process", |