Don't try to copy files if just one config server

2 files changed, 9 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
index daf426517b8..4ae9834b87f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
+++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
@@ -77,7 +77,7 @@ public class AdminModel extends ConfigModel {
 
         @Override
         public void doBuild(AdminModel model, Element adminElement, ConfigModelContext modelContext) {
-            if (modelContext.getDeployState().isHosted()) { // admin v2 is used on hosted: Build a default V4 instead
+            if (modelContext.getDeployState().isHosted()) { // admin v4 is used on hosted: Build a default V4 instead
                 new BuilderV4().doBuild(model, adminElement, modelContext);
                 return;
             }
@@ -87,6 +87,7 @@ public class AdminModel extends ConfigModel {
                                                                  properties.multitenant(),
                                                                  properties.configServerSpecs());
             model.admin = domBuilder.build(modelContext.getDeployState(), parent, adminElement);
+
             // TODO: Is required since other models depend on admin.
             if (parent instanceof ApplicationConfigProducerRoot) {
                 ((ApplicationConfigProducerRoot)parent).setupAdmin(model.admin);
@@ -109,7 +110,7 @@ public class AdminModel extends ConfigModel {
 
         @Override
         public void doBuild(AdminModel model, Element adminElement, ConfigModelContext modelContext) {
-            AbstractConfigProducer parent = modelContext.getParentProducer();
+            AbstractConfigProducer<?> parent = modelContext.getParentProducer();
             ModelContext.Properties properties = modelContext.getDeployState().getProperties();
             DomAdminV4Builder domBuilder = new DomAdminV4Builder(modelContext,
                                                                  properties.multitenant(),
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 1d00580f390..2fcb9632357 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1617,8 +1617,12 @@ public class ModelProvisioningTest {
         tester.addHosts(3);
         VespaModel model = tester.createModel(xmlWithNodes, true);
 
-        assertEquals("Nodes in container cluster", 1, model.getContainerClusters().get("container1").getContainers().size());
-        assertEquals("Nodes in content cluster (downscaled)", 1, model.getContentClusters().get("content").getRootGroup().getNodes().size());
+        assertEquals("Nodes in container cluster", 1,
+                     model.getContainerClusters().get("container1").getContainers().size());
+        assertEquals("Nodes in content cluster (downscaled)", 1,
+                     model.getContentClusters().get("content").getRootGroup().getNodes().size());
+
+        assertEquals(1, model.getAdmin().getSlobroks().size());
 
         model.getConfig(new StorStatusConfig.Builder(), "default");
         StorageCluster storage = model.getContentClusters().get("content").getStorageCluster();