summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorMorten Tokle <mortent@oath.com>2019-11-25 09:04:41 +0100
committerMorten Tokle <mortent@oath.com>2019-11-25 09:07:01 +0100
commit1c2f216620f208a28de4985112ee87fe3c582ec3 (patch)
tree5b2112f791c09ca92411f570f5f0748dec568460 /config-provisioning
parentbf04cdc3471570c4cfd1ffa57a66eaad1f4263ae (diff)
Allow tenant containers to run on dev hosts
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/abi-spec.json3
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java7
2 files changed, 9 insertions, 1 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 91907af75c4..a2f914ca6f7 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -673,7 +673,8 @@
"public boolean isDockerHost()",
"public java.lang.String description()",
"public com.yahoo.config.provision.NodeType childNodeType()",
- "public java.util.List childNodeTypes()"
+ "public java.util.List childNodeTypes()",
+ "public boolean supportsChild(com.yahoo.config.provision.NodeType)"
],
"fields": [
"public static final enum com.yahoo.config.provision.NodeType tenant",
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 009d8fd73cb..93f2602cacc 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
@@ -71,4 +71,11 @@ public enum NodeType {
return childNodeTypes;
}
+ /**
+ * @param type Child {@link NodeType}
+ * @return true if the {@link NodeType} can run on this host, false otherwise.
+ */
+ public boolean supportsChild(NodeType type) {
+ return isDockerHost() && childNodeTypes.contains(type);
+ }
}