Merge pull request #3430 from vespa-engine/revert-3357-revert-3354-musum/move-orchestrator-config-definition

Revert 3357 revert 3354 musum/move orchestrator config definition

6 files changed, 17 insertions, 1 deletions

diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java
new file mode 100644
index 00000000000..f6ee478cc9f
--- /dev/null
+++ b/configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java
@@ -0,0 +1,6 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.vespa.orchestrator.config;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 15819b6bd47..92cb9ac22a7 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -32,6 +32,8 @@ vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
 install(FILES messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions model.def)
 install(FILES model.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+vespa_generate_config(configdefinitions orchestrator.def)
+install(FILES orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions persistence.def)
 install(FILES persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions rank-profiles.def)
diff --git a/orchestrator/src/main/resources/configdefinitions/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def
index a546f8e8a1c..ab52c777398 100644
--- a/orchestrator/src/main/resources/configdefinitions/orchestrator.def
+++ b/configdefinitions/src/vespa/orchestrator.def
@@ -1,5 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.orchestrator
+namespace=vespa.orchestrator.config
 
 # TODO: Change the default to actual latency in real setup.
 serviceMonitorConvergenceLatencySeconds int default=0
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index 55bf086dfc7..c2091e74435 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -72,6 +72,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>configdefinitions</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.glassfish.jersey.ext</groupId>
       <artifactId>jersey-proxy-client</artifactId>
         <exclusions>
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
index ea45d955861..e88e8a7dd4a 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.applicationmodel.ClusterId;
 import com.yahoo.vespa.applicationmodel.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceCluster;
+import com.yahoo.vespa.orchestrator.config.OrchestratorConfig;
 import com.yahoo.vespa.orchestrator.controller.ClusterControllerClient;
 import com.yahoo.vespa.orchestrator.controller.ClusterControllerClientFactory;
 import com.yahoo.vespa.orchestrator.controller.ClusterControllerNodeState;
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
index 11518bb4545..92d6216583f 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
@@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.applicationmodel.HostName;
+import com.yahoo.vespa.orchestrator.config.OrchestratorConfig;
 import com.yahoo.vespa.orchestrator.controller.ClusterControllerClientFactoryMock;
 import com.yahoo.vespa.orchestrator.policy.BatchHostStateChangeDeniedException;
 import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException;