diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-21 15:50:55 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-03-21 15:50:55 +0100 |
commit | 5075ba040290b3ea93be67e86af19cef092c7f9c (patch) | |
tree | a25e0f7efc10be7a7c8a96a2bda4a5099fd3d758 /standalone-container/src | |
parent | 573e322c1ac89e4c8b9f5a7f9e9784c23db2a2f0 (diff) |
Use the new variables
Diffstat (limited to 'standalone-container/src')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java | 12 |
1 files changed, 7 insertions, 5 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 2125fb0e499..3067d732ebf 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 @@ -26,8 +26,7 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { @Override public ConfigServer[] allConfigServers() { return Optional.ofNullable(System.getenv("VESPA_CONFIGSERVERS")) - .map(Optional::of) // TODO Rewrite Optional.or() with Java 9 - .orElseGet(() -> getRawInstallVariable("services.addr_configserver")) + .or(() -> getRawInstallVariable("services.addr_configserver")) .map(CloudConfigInstallVariables::toConfigServers) .orElseGet(() -> new ConfigServer[0]); } @@ -80,17 +79,20 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { @Override public Optional<String> environment() { - return getInstallVariable("environment"); + return Optional.ofNullable(System.getenv("VESPA_ENVIRONMENT")) + .or(() -> getInstallVariable("environment")); } @Override public Optional<String> region() { - return getInstallVariable("region"); + return Optional.ofNullable(System.getenv("VESPA_REGION")) + .or(() -> getInstallVariable("region")); } @Override public Optional<String> system() { - return getInstallVariable("system"); + return Optional.ofNullable(System.getenv("VESPA_SYSTEM")) + .or(() -> getInstallVariable("system")); } @Override |