Add combined cluster type

1 files changed, 13 insertions, 1 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 496874e978b..84b344791c8 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -101,13 +101,25 @@ public final class ClusterSpec {
         // These enum values are stored in ZooKeeper - do not change
         admin,
         container,
-        content;
+        content,
+        combined;
+
+        /** Returns whether this runs a content cluster */
+        public boolean isContent() {
+            return this == content || this == combined;
+        }
+
+        /** Returns whether this runs a container cluster */
+        public boolean isContainer() {
+            return this == container || this == combined;
+        }
 
         public static Type from(String typeName) {
             switch (typeName) {
                 case "admin" : return admin;
                 case "container" : return container;
                 case "content" : return content;
+                case "combined" : return combined;
                 default: throw new IllegalArgumentException("Illegal cluster type '" + typeName + "'");
             }
         }