summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-14 10:41:04 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-14 10:41:04 +0100
commitd74b8c2101c620f464bcaacdc5411ddfdcecca1a (patch)
treecdabb009a760393153804102800a60055d6c1571
parentc738982d2e252782e436e49c5ba4b94d49330eca (diff)
Allow referencing conternt clusters also from 'jdisk' tags
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index e72e05a6ebc..79bf73dd819 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -292,7 +292,7 @@ public class NodesSpecification {
var contentClusterId = content.get().getAttribute("id");
if (contentClusterId.isEmpty()) return false;
for (var rootChild : XML.getChildren(services.get())) {
- if (!"container".equals(rootChild.getTagName())) continue; // Only container can reference content
+ if ( ! "container".equals(rootChild.getTagName()) && ! "jdisk".equals(rootChild.getTagName())) continue; // Only container can reference content
var nodes = XML.getChild(rootChild, "nodes");
if (nodes == null) continue;
if (!contentClusterId.equals(nodes.getAttribute("of"))) continue;