aboutsummaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/main/java/com/yahoo/config/provision
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-01-17 18:50:33 +0100
committerGitHub <noreply@github.com>2022-01-17 18:50:33 +0100
commit6d6853577ac06f1470db0a23481152fe3277a286 (patch)
treeb5b633d2b3aa32227185fba6cf4972d9fff4e825 /config-provisioning/src/main/java/com/yahoo/config/provision
parent64ef088e77b389c2488e5f9be1e9c60888bd7c29 (diff)
Revert "Remove dev system"
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java5
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java7
2 files changed, 10 insertions, 2 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
index 25ec7485c24..a617c7bcea3 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
@@ -32,7 +32,10 @@ public enum NodeType {
controller("Controller node"),
/** Host of a controller node */
- controllerhost("Controller host", controller);
+ controllerhost("Controller host", controller),
+
+ /** Host capable of running multiple node types, only used in {@link SystemName#dev} */
+ devhost("Dev host", config, controller, tenant);
private final String description;
private final List<NodeType> childNodeTypes;
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 fef5babc806..e2349f6f63f 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
@@ -24,7 +24,10 @@ public enum SystemName {
Public(true, false),
/** Continuous deployment system for testing the Public system */
- PublicCd(true, true);
+ PublicCd(true, true),
+
+ /** Local development system */
+ dev(false, false);
private final boolean isPublic;
private final boolean isCd;
@@ -40,6 +43,7 @@ public enum SystemName {
public static SystemName from(String value) {
switch (value.toLowerCase()) {
+ case "dev": return dev;
case "cd": return cd;
case "main": return main;
case "public": return Public;
@@ -50,6 +54,7 @@ public enum SystemName {
public String value() {
switch (this) {
+ case dev: return "dev";
case cd: return "cd";
case main: return "main";
case Public: return "public";