summaryrefslogtreecommitdiffstats
path: root/configdefinitions
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-09-11 14:19:26 +0200
committerGitHub <noreply@github.com>2017-09-11 14:19:26 +0200
commit072b9c5b30dccbb0d375974fc8dd9a5d39710878 (patch)
tree73b62e7b3a8547c5a73ef070c16f78bf21ea1660 /configdefinitions
parent608a89f6e3d0d6832f9854b2fc0d692fee4857f8 (diff)
Revert "Revert "Move orchestrator.def to configdefinititions/""
Diffstat (limited to 'configdefinitions')
-rw-r--r--configdefinitions/src/vespa/CMakeLists.txt2
-rw-r--r--configdefinitions/src/vespa/orchestrator.def5
2 files changed, 7 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/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/orchestrator.def
new file mode 100644
index 00000000000..a546f8e8a1c
--- /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
+
+# TODO: Change the default to actual latency in real setup.
+serviceMonitorConvergenceLatencySeconds int default=0