Make sure to set 'cloud' in configserver config

2 files changed, 6 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index 5e7c22f8844..f342aa1a2bf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -32,6 +32,7 @@ public interface CloudConfigOptions {
     Optional<String> environment();
     Optional<String> region();
     Optional<String> system();
+    default Optional<String> cloud() { return Optional.empty(); }
     Optional<Boolean> useVespaVersionInRequest();
     Optional<String> loadBalancerAddress();
     Optional<String> athenzDnsSuffix();
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 5ffb37feb70..5560a633f66 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
@@ -95,6 +95,11 @@ public class CloudConfigInstallVariables implements CloudConfigOptions {
     }
 
     @Override
+    public Optional<String> cloud() {
+        return Optional.ofNullable(System.getenv("VESPA_CLOUD"));
+    }
+
+    @Override
     public Optional<Boolean> useVespaVersionInRequest() {
         return getInstallVariable("use_vespa_version_in_request", Boolean::parseBoolean);
     }