Merge pull request #7190 from vespa-engine/balder/reduce-usage-of-complex-deploystate

Balder/reduce usage of complex deploystate

1 files changed, 4 insertions, 3 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 8fff69e11a6..113262d0734 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
@@ -9,6 +9,7 @@ import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.deploy.DeployProperties;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.builder.xml.ConfigModelId;
+import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.builder.xml.dom.DomAdminV2Builder;
@@ -44,12 +45,12 @@ public class AdminModel extends ConfigModel {
     private Collection<ContainerModel> getContainerModels() { return containerModels; }
 
     @Override
-    public void prepare(ConfigModelRepo configModelRepo) {
+    public void prepare(ConfigModelRepo configModelRepo, DeployState deployState) {
         verifyClusterControllersOnlyDefinedForContent(configModelRepo);
         if (admin == null) return;
         if (admin.getClusterControllers() != null)
-            admin.getClusterControllers().prepare();
-        admin.getLogServerContainerCluster().ifPresent(ContainerCluster::prepare);
+            admin.getClusterControllers().prepare(deployState);
+        admin.getLogServerContainerCluster().ifPresent((ContainerCluster cc) -> cc.prepare(deployState));
     }
 
     private void verifyClusterControllersOnlyDefinedForContent(ConfigModelRepo configModelRepo) {