diff options
4 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index ef0f4882f1c..24c3d93524c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -102,6 +102,9 @@ public class ConfigserverCluster extends AbstractConfigProducer if (options.region().isPresent()) { builder.region(options.region().get()); } + if (options.system().isPresent()) { + builder.environment(options.system().get()); + } if (options.defaultFlavor().isPresent()) { builder.defaultFlavor(options.defaultFlavor().get()); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java index 3bb4f9d09f5..57c4691f523 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java @@ -28,13 +28,13 @@ public interface CloudConfigOptions { String[] configModelPluginDirs(); Optional<Long> sessionLifeTimeSecs(); - //TODO: which unit? - Optional<Long> zookeeperBarrierTimeout(); + Optional<Long> zookeeperBarrierTimeout(); //in seconds Optional<Integer> zookeeperElectionPort(); Optional<Integer> zookeeperQuorumPort(); Optional<String> payloadCompressionType(); Optional<String> environment(); Optional<String> region(); + Optional<String> system(); Optional<String> defaultFlavor(); Optional<String> defaultAdminFlavor(); Optional<String> defaultContainerFlavor(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java index b423a2b2305..31651c5166b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java @@ -89,6 +89,9 @@ public class TestOptions implements CloudConfigOptions { public Optional<String> region() { return region; } @Override + public Optional<String> system() { return Optional.empty(); } + + @Override public Optional<String> defaultFlavor() { return defaultFlavor; } @Override diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala index 188bedfbc20..0a53200d970 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala @@ -28,6 +28,7 @@ class CloudConfigYinstVariables extends CloudConfigOptions { override val payloadCompressionType = optionalYinstVar[java.lang.String]("payload_compression_type") override val environment = optionalYinstVar[java.lang.String]("environment") override val region = optionalYinstVar[java.lang.String]("region") + override val system = optionalYinstVar[java.lang.String]("system") override val defaultFlavor = optionalYinstVar[java.lang.String]("default_flavor") override val defaultAdminFlavor = optionalYinstVar[java.lang.String]("default_admin_flavor") override val defaultContainerFlavor = optionalYinstVar[java.lang.String]("default_container_flavor") |