diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2022-08-30 10:13:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 10:13:41 +0200 |
| commit | f68ac5ef5774dfb878e2df010f5257a66b4d6669 (patch) | |
| tree | 6b5e4decc99863b64a0383570cc9c9bdeb09a8f6 /config-model/src | |
| parent | 880e62e89020c90f0987c624e6b524906f312182 (diff) | |
| parent | 70f97248a925720bea816f64f237349679c792b7 (diff) | |
Merge pull request #23842 from vespa-engine/bjorncs/zk-tls-config
Bjorncs/zk tls config
Diffstat (limited to 'config-model/src')
2 files changed, 7 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index bbccdaa9453..98b8574a015 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -81,6 +81,9 @@ public class ConfigserverCluster extends AbstractConfigProducer if (options.zookeeperClientPort().isPresent()) { builder.clientPort(options.zookeeperClientPort().get()); } + if (options.hostedVespa().orElse(false)) { + builder.vespaTlsConfigFile(Defaults.getDefaults().underVespaHome("conf/zookeeper/tls.conf.json")); + } } @Override diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java index 4bf4cc71890..c71f3946937 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java @@ -41,6 +41,7 @@ public class ConfigserverClusterTest { assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::hostname, "localhost"); assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 0); assertEquals(0, config.myid()); + assertEquals("/opt/vespa/conf/zookeeper/tls.conf.json", config.vespaTlsConfigFile()); } @Test @@ -51,6 +52,7 @@ public class ConfigserverClusterTest { assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 0, 1, 2); assertEquals(1, config.myid()); assertEquals("gz", config.snapshotMethod()); + assertEquals("/opt/vespa/conf/zookeeper/tls.conf.json", config.vespaTlsConfigFile()); } @Test @@ -60,6 +62,7 @@ public class ConfigserverClusterTest { assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::hostname, "cfg1", "localhost", "cfg3"); assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 4, 2, 3); assertEquals(2, config.myid()); + assertEquals("/opt/vespa/conf/zookeeper/tls.conf.json", config.vespaTlsConfigFile()); } @Test @@ -71,6 +74,7 @@ public class ConfigserverClusterTest { assertZookeeperServerProperty(config.server(), ZookeeperServerConfig.Server::id, 4, 2, 3); assertEquals(2, config.myid()); assertEquals("gz", config.snapshotMethod()); + assertEquals("", config.vespaTlsConfigFile()); } @Test |