Merge pull request #5197 from vespa-engine/hmusum/add-more-config-for-config-server

Set some more config server config

1 files changed, 7 insertions, 1 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 2ddfebea36f..3a41bc3e2da 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
@@ -35,8 +35,14 @@ public class ConfigServerContainerData {
                 "  <environment>" + environment.getEnvironment() + "</environment>\n" +
                 "  <region>" + environment.getRegion() + "</region>\n" +
                 "  <hostedVespa>true</hostedVespa>\n" +
-                "  <defaultFlavor>t2.xlarge</defaultFlavor>\n" + // TODO: Avoid hardcoding
+                "  <multitenant>true</multitenant>\n" +
+                "  <useVespaVersionInRequest>true</useVespaVersionInRequest>\n" +
+                // TODO: Avoid hardcoding of default flavor
+                "  <defaultFlavor>t2.xlarge</defaultFlavor>\n" +
                 createZookeeperServers() +
+                "  <zookeeper>\n" +
+                "    <barrierTimeout>1200</barrierTimeout>\n" +
+                "  </zookeeper>\n" +
                 "  <serverId>" + configServerNodeHostName + "</serverId>\n" +
                 "  <nodeAdminInContainer>false</nodeAdminInContainer>\n" +
                 "</config>\n";