summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <morten.tokle@gmail.com>2019-02-15 13:36:49 +0100
committerGitHub <noreply@github.com>2019-02-15 13:36:49 +0100
commit5c7396d271bdd02951854c4f2b7b14de8deeb5ad (patch)
treeba10d24cf798cfb6e3bc74dcb3495869e36cebaa
parentf0352c8c527ed03c7bc82ba22aaeee14d38ef516 (diff)
parenta1c9185dcbd1946381c5061f76844084797f669f (diff)
Merge pull request #8514 from vespa-engine/mortent/vaas
Add vaas
-rw-r--r--config-provisioning/abi-spec.json3
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java6
2 files changed, 7 insertions, 2 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 852e9a4af01..5372e18e109 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -660,7 +660,8 @@
"public static final enum com.yahoo.config.provision.SystemName dev",
"public static final enum com.yahoo.config.provision.SystemName cd",
"public static final enum com.yahoo.config.provision.SystemName main",
- "public static final enum com.yahoo.config.provision.SystemName Public"
+ "public static final enum com.yahoo.config.provision.SystemName Public",
+ "public static final enum com.yahoo.config.provision.SystemName vaas"
]
},
"com.yahoo.config.provision.TenantName": {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
index f4b6e0435df..891c213e9aa 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
@@ -18,7 +18,10 @@ public enum SystemName {
main,
/** System accessible for the public */
- Public;
+ Public,
+
+ /** VaaS */
+ vaas;
public static SystemName defaultSystem() {
return main;
@@ -31,6 +34,7 @@ public enum SystemName {
case "main": return main;
case "public": return Public;
case "Public": return Public;
+ case "vaas": return vaas;
default: throw new IllegalArgumentException(String.format("'%s' is not a valid system", value));
}
}