diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-05-16 20:20:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-16 20:20:45 +0200 |
commit | 36fe5e7f74f10c3589fef7b55c196e4aff572cd0 (patch) | |
tree | a967ab28d07df2356f72ae346c87f27da6d812ae /config-model | |
parent | 7a0459d8ac8c7918c188278007617e988f889a98 (diff) | |
parent | 3e0a839a6a1c9c1f07af7e85fc828584db1ff8d5 (diff) |
Merge pull request #27146 from vespa-engine/jonmv/store-endpoint-settings-also-without-nodes-tag
Store endpoint settings also when parsing container without nodes
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 |
1 files changed, 3 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 3cb0731c43a..e1d222e0546 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 @@ -932,9 +932,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { int nodeCount = deployState.zone().environment().isProduction() ? 2 : 1; deployState.getDeployLogger().logApplicationPackage(Level.INFO, "Using " + nodeCount + " nodes in " + cluster); var nodesSpec = NodesSpecification.dedicated(nodeCount, context); + ClusterSpec.Id clusterId = ClusterSpec.Id.from(cluster.getName()); var hosts = nodesSpec.provision(hostSystem, ClusterSpec.Type.container, - ClusterSpec.Id.from(cluster.getName()), + clusterId, + zoneEndpoint(context, clusterId), deployState.getDeployLogger(), false, context.clusterInfo().build()); |