diff options
4 files changed, 16 insertions, 0 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 cdd90ae1a36..891f68041f1 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 @@ -137,6 +137,8 @@ public class ConfigserverCluster extends AbstractConfigProducer if (options.loadBalancerAddress().isPresent()) { builder.loadBalancerAddress(options.loadBalancerAddress().get()); } + options.athenzDnsSuffix().ifPresent(builder::athenzDnsSuffix); + options.ztsUrl().ifPresent(builder::ztsUrl); } private String[] getConfigModelPluginDirs() { 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 9dbbdfb7696..c8a39faa1d9 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 @@ -42,4 +42,6 @@ public interface CloudConfigOptions { Optional<Boolean> useVespaVersionInRequest(); Optional<Integer> numParallelTenantLoaders(); Optional<String> loadBalancerAddress(); + Optional<String> athenzDnsSuffix(); + Optional<String> ztsUrl(); } diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index 77f45b104b2..0ad649a4b06 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -45,6 +45,8 @@ payloadCompressionType enum { UNCOMPRESSED, LZ4 } default=LZ4 # Athenz config loadBalancerAddress string default="" +athenzDnsSuffix string default="" +ztsUrl string default="" # Node admin nodeAdminInContainer bool default=true diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java index 2b030656e29..be91eceee2f 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java @@ -124,6 +124,16 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { return getInstallVariable("load_balancer_address"); } + @Override + public Optional<String> athenzDnsSuffix() { + return getInstallVariable("athenz_dns_suffix"); + } + + @Override + public Optional<String> ztsUrl() { + return getInstallVariable("zts_url"); + } + static ConfigServer[] toConfigServers(String configserversString) { return multiValueParameterStream(configserversString) .map(CloudConfigInstallVariables::toConfigServer) |