diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-09-17 13:03:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 13:03:40 +0200 |
| commit | 98a9ddc6bbed5e61130eeb1e1100ed9b42d09553 (patch) | |
| tree | 4f75797363197941fd2590f53e8575d4d117e81e /configdefinitions | |
| parent | ebc628ed34f9934be3498ba86a950ad1f88c160f (diff) | |
| parent | 7fa3328a3bb885f0e376c5dd39ca6b27c18c213b (diff) | |
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
Diffstat (limited to 'configdefinitions')
3 files changed, 13 insertions, 0 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/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def new file mode 100644 index 00000000000..ab52c777398 --- /dev/null +++ b/configdefinitions/src/vespa/orchestrator.def @@ -0,0 +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.config + +# TODO: Change the default to actual latency in real setup. +serviceMonitorConvergenceLatencySeconds int default=0 |