diff options
author | Harald Musum <musum@oath.com> | 2018-03-02 13:29:39 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-03-02 13:29:39 +0100 |
commit | d5bc61957d8ceea735f2c49b00a0e455026760b5 (patch) | |
tree | d02c69d3786057548332b7d37ef6690c6a8fc223 | |
parent | 64a8801dad13cae3158cd021ab2c1402805c24ad (diff) |
Set some more config server config
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/containerdata/ConfigServerContainerData.java | 8 |
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"; |