Move ZooKeeperServer to another module

zookeeper-server jar is not a preinstalled bundle, as zkfacade is,
so need to add bundle explicitly for clustercontroller and add
symlink from components dir for config server

1 files changed, 2 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 a9af815aa1e..e45bf3f0921 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("zkfacade");
+    private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zookeeper-server");
 
     private final Set<String> bundles = new TreeSet<>();
 
@@ -59,6 +59,7 @@ 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