Set node count to 1 if not specified for all zones in hosted

2 files changed, 2 insertions, 3 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 a2d9433df1d..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 manually deployed 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);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index aaecc47f943..c7d9ae6b818 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -313,7 +313,7 @@ public class VespaModelTestCase {
     }
 
     @Test
-    void testNoNodesCountInDev() {
+    void testNoNodesCount() {
          var services =
                 """
                         <services version='1.0'>
@@ -328,7 +328,6 @@ public class VespaModelTestCase {
         var app = new MockApplicationPackage.Builder().withServices(services).build();
         var deployState = new DeployState.Builder()
                 .applicationPackage(app)
-                .zone(new Zone(Environment.dev, RegionName.from("test")))
                 .properties(new TestProperties()
                                     .setHostedVespa(true)
                                     .setApplicationId(ApplicationId.from("foo", "bar", "default-t")))