diff options
| author | Harald Musum <musum@yahooinc.com> | 2024-04-07 22:41:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-07 22:41:03 +0200 |
| commit | 14462536eb7b530b184d48484976f72f2ab3b56c (patch) | |
| tree | 2675e636afa5e954ba17261ce46bde594a8aff1f /config-model/src/main/java/com/yahoo/vespa | |
| parent | 59cbad455146da8ff5e10760354395959ad8adb0 (diff) | |
| parent | 68bafbf5963259f4ad506c9e1bea1937a7f1dfcb (diff) | |
Merge pull request #30843 from vespa-engine/hmusum/no-node-count-means-1-node
Hmusum/no node count means 1 node
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index eac03531b86..4abd6e89b15 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -1002,7 +1002,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return containers; } else if (nodesElement.hasAttribute("count")) // regular, hosted node spec return createNodesFromNodeCount(cluster, containerElement, nodesElement, context); - else if (cluster.isHostedVespa() && cluster.getZone().environment().isManuallyDeployed()) // default to 1 in manual zones + else if (cluster.isHostedVespa()) // default to 1 if node count is not specified return createNodesFromNodeCount(cluster, containerElement, nodesElement, context); else // the non-hosted option return createNodesFromNodeList(context.getDeployState(), cluster, nodesElement); |