diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-17 20:13:22 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-10-17 20:13:22 +0200 |
commit | 8335ad4157c88face97bb00b07f1239fb9c5269b (patch) | |
tree | 413878714577e93bc843f627c7ebeecc39220fdb /configserver | |
parent | f966b8ff891e835972866865453dc54d5c2a858a (diff) |
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
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
-rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index 8f939e54d55..54961945407 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -20,4 +20,5 @@ install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configse install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar) install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar) install_symlink(lib/jars/zkfacade-jar-with-dependencies.jar conf/configserver-app/components/zkfacade.jar) +install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar) install_symlink(conf/configserver-app/components lib/jars/config-models) diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 97b2156e8ca..25e6a727841 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -11,7 +11,7 @@ <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" /> - <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" /> + <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zookeeper-server" /> <component id="com.yahoo.vespa.config.server.rpc.RpcServer" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.ConfigServerDB" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.session.FileDistributionFactory" bundle="configserver" /> |