From 6d6853577ac06f1470db0a23481152fe3277a286 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 17 Jan 2022 18:50:33 +0100 Subject: Revert "Remove dev system" --- .../src/main/java/com/yahoo/config/provision/NodeType.java | 5 ++++- .../src/main/java/com/yahoo/config/provision/SystemName.java | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision') 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 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"; -- cgit v1.2.3