summaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-05-22 13:04:44 +0200
committerGitHub <noreply@github.com>2018-05-22 13:04:44 +0200
commit5844b705da5ea0f953bf2950b13633c3b439eac9 (patch)
treeaa1101445d1b9a2f9156797aa5ae32502160d3c3 /standalone-container
parent00f4225c4f1943d6b7ba5d5fb4c699a2425b7f83 (diff)
parentb5d7bb62636c37511dcf215e4601c846d344d2cc (diff)
Merge pull request #5878 from vespa-engine/bjorncs/proper-athenz-identity-provider-config
Bjorncs/proper athenz identity provider config
Diffstat (limited to 'standalone-container')
-rw-r--r--standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java10
1 files changed, 10 insertions, 0 deletions
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)