summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java4
1 files changed, 3 insertions, 1 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 b77325dce93..3d3197ddd1c 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
@@ -15,7 +15,9 @@ public class CloudConfigInstallVariables implements CloudConfigOptions {
@Override
public Optional<Integer> rpcPort() {
- return getInstallVariable("port_configserver_rpc", "services", Integer::parseInt);
+ return Optional.ofNullable(System.getenv("VESPA_CONFIGSERVER_RPC_PORT"))
+ .or(() -> getRawInstallVariable("services.port_configserver_rpc"))
+ .map(Integer::parseInt);
}
@Override