From 1fe7b497cf2b24b458634704641ff4bf8426b89c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Wed, 11 Dec 2019 19:16:32 +0100
Subject: Support documented VESPA_CONFIGSERVER_RPC_PORT environment variable

---
 .../com/yahoo/container/standalone/CloudConfigInstallVariables.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'standalone-container/src')

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
-- 
cgit v1.2.3