diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-07 07:40:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 07:40:56 +0200 |
| commit | 69d1d5e192ec55601bbd54374a67d3a5489630b9 (patch) | |
| tree | 0378d78df691703e20ef0000dfa4ccc33eb177ba | |
| parent | 92526ea24add9baecf8e41b3c99fc3adf7b89e49 (diff) | |
| parent | 833d22a74ff9777ae6e3bc24f18d3d50834a1e25 (diff) | |
Merge pull request #3354 from vespa-engine/musum/move-orchestrator-config-definition
Move orchestrator.def to configdefinititions/
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/orchestrator.def (renamed from orchestrator/src/main/resources/configdefinitions/orchestrator.def) | 0 | ||||
| -rw-r--r-- | orchestrator/pom.xml | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 96a48acb72b..1566e97ff3a 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -34,6 +34,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..a546f8e8a1c 100644 --- a/orchestrator/src/main/resources/configdefinitions/orchestrator.def +++ b/configdefinitions/src/vespa/orchestrator.def 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> |