diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2022-01-17 23:16:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-17 23:16:11 +0100 |
commit | 5fe129740c835f0e552bd6492cb2e110e9d5f0f3 (patch) | |
tree | 1d9e86eb7cde66e300c6b65233824da7f5bebce2 /config-provisioning | |
parent | 7e0c5b69ff9e99447dd7cf223321e760f4f2a130 (diff) |
Revert "Revert "Remove dev system""
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java | 5 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java | 7 |
2 files changed, 2 insertions, 10 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 a617c7bcea3..25ec7485c24 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,10 +32,7 @@ public enum NodeType { controller("Controller node"), /** Host of a controller node */ - controllerhost("Controller host", controller), - - /** Host capable of running multiple node types, only used in {@link SystemName#dev} */ - devhost("Dev host", config, controller, tenant); + controllerhost("Controller host", controller); 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 e2349f6f63f..fef5babc806 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,10 +24,7 @@ public enum SystemName { Public(true, false), /** Continuous deployment system for testing the Public system */ - PublicCd(true, true), - - /** Local development system */ - dev(false, false); + PublicCd(true, true); private final boolean isPublic; private final boolean isCd; @@ -43,7 +40,6 @@ 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; @@ -54,7 +50,6 @@ public enum SystemName { public String value() { switch (this) { - case dev: return "dev"; case cd: return "cd"; case main: return "main"; case Public: return "public"; |