summaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-10-18 08:56:15 +0200
committerGitHub <noreply@github.com>2019-10-18 08:56:15 +0200
commit26b8e6a8f25e4df000bc0143ef1b295efd5d4e4e (patch)
tree0a65db84c7b15ea390aa79694ac73ab8b59d3695 /config-model/src
parent09b9a84eeb6b2124c356bc1065fd54b596abb37e (diff)
Revert "Move ZooKeeperServer to another module"
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java3
1 files changed, 1 insertions, 2 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 e45bf3f0921..a9af815aa1e 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
@@ -29,7 +29,7 @@ public class ClusterControllerContainer extends Container implements
ZookeeperServerConfig.Producer
{
private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps");
- private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zookeeper-server");
+ private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zkfacade");
private final Set<String> bundles = new TreeSet<>();
@@ -59,7 +59,6 @@ public class ClusterControllerContainer extends Container implements
addFileBundle("lib/jars/clustercontroller-apputil-jar-with-dependencies.jar");
addFileBundle("lib/jars/clustercontroller-core-jar-with-dependencies.jar");
addFileBundle("lib/jars/clustercontroller-utils-jar-with-dependencies.jar");
- addFileBundle("lib/jars/zookeeper-server-jar-with-dependencies.jar");
}
@Override