Use the new variables

3 files changed, 9 insertions, 7 deletions

diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index 649eef951c0..28efd808728 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -105,7 +105,7 @@ case $1 in
     start)
         nohup sbin/vespa-retention-enforcer > ${LOGDIR}/vre-start.log 2>&1 </dev/null &
         configsources=`bin/vespa-print-default configservers_rpc`
-        userargs=$vespa_base__jvmargs_configproxy
+        userargs=$VESPA_CONFIGPROXY_JVMARGS
         if [ "$userargs" == "" ]; then
             userargs=$services__jvmargs_configproxy
         fi
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 2589d5940ca..12895465c6a 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -147,7 +147,7 @@ export standalone_jdisc_container__deployment_profile=configserver
 # class path
 CP="${VESPA_HOME}/lib/jars/jdisc_core-jar-with-dependencies.jar"
 
-baseuserargs="$vespa_base__jvmargs_configserver"
+baseuserargs="$VESPA_CONFIGSERVER_JVMARGS"
 serveruserargs="$cloudconfig_server__jvmargs"
 jvmargs="$baseuserargs $serveruserargs"
 
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