summaryrefslogtreecommitdiffstats
path: root/configdefinitions/src
diff options
context:
space:
mode:
Diffstat (limited to 'configdefinitions/src')
-rw-r--r--configdefinitions/src/main/java/com/yahoo/vespa/orchestrator/config/package-info.java6
-rw-r--r--configdefinitions/src/vespa/CMakeLists.txt2
-rw-r--r--configdefinitions/src/vespa/orchestrator.def5
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