From 1c2f216620f208a28de4985112ee87fe3c582ec3 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Mon, 25 Nov 2019 09:04:41 +0100 Subject: Allow tenant containers to run on dev hosts --- config-provisioning/abi-spec.json | 3 ++- .../src/main/java/com/yahoo/config/provision/NodeType.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'config-provisioning') 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); + } } -- cgit v1.2.3