Merge pull request #5253 from vespa-engine/hmusum/remove-zookeeper-servers-from-configserver-config

Remove from config server config now that we do this with env variabl…

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" +