summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-02-28 21:47:03 +0100
committerHarald Musum <musum@verizonmedia.com>2021-02-28 21:47:03 +0100
commit446699adb5163359e17af7548f68e7464bd06a5b (patch)
tree510d10a6360cec5759715d0a9535db879b75d9a0 /config-model
parentac14984ac58e4a592f6797c3e80cecda17e7e09a (diff)
Only add reconfigurable components for standalone zookeeper for cluster controllers
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index eefe245f060..20bc0c65bad 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -89,7 +89,7 @@ public class ClusterControllerContainer extends Container implements
}
private void configureZooKeeperServer(boolean runStandaloneZooKeeper, boolean reconfigurable) {
- if (reconfigurable) {
+ if (reconfigurable && runStandaloneZooKeeper) {
ContainerModelBuilder.addReconfigurableZooKeeperServerComponents(this);
} else {
addComponent("clustercontroller-zookeeper-server",