summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-03-08 11:44:04 +0100
committerHarald Musum <musum@oath.com>2018-03-08 11:44:04 +0100
commit9e7b5a4b1b9ebf7aec83235d122479d00db374f0 (patch)
tree7e7c8a6b889569a2064fb08211e0ab4ea30c8bf4
parent5c1a9d839aeea8beb689fa571e1ce33b99d06107 (diff)
Remove from config server config now that we do this with env variables instead
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java
index 3a41bc3e2da..3aaba0f1451 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java
@@ -39,7 +39,6 @@ public class ConfigServerContainerData {
" <useVespaVersionInRequest>true</useVespaVersionInRequest>\n" +
// TODO: Avoid hardcoding of default flavor
" <defaultFlavor>t2.xlarge</defaultFlavor>\n" +
- createZookeeperServers() +
" <zookeeper>\n" +
" <barrierTimeout>1200</barrierTimeout>\n" +
" </zookeeper>\n" +
@@ -48,15 +47,6 @@ public class ConfigServerContainerData {
"</config>\n";
}
- private String createZookeeperServers() {
- StringBuilder zookeeperServers = new StringBuilder(" <zookeeperserver>\n");
- environment.getConfigServerHostNames().forEach(hostname -> zookeeperServers.append(" <item>\n" +
- " <hostname>" + hostname + "</hostname>\n" +
- " </item>\n"));
- zookeeperServers.append(" </zookeeperserver>\n");
- return zookeeperServers.toString();
- }
-
// TODO: Avoid hardcoded Docker registry
private String createNodeRepoConfigXml() {
return "<config name=\"config.provisioning.node-repository\">\n" +