From 97f52ec1e72f816c380d0bde609cc0f0789eec48 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Wed, 14 Dec 2022 11:48:08 +0100
Subject: Revert "Turn off dynamic reconfiguration for non-hosted config server
 [run-systemtest]"

---
 .../model/admin/clustercontroller/ClusterControllerContainer.java     | 3 +--
 .../com/yahoo/vespa/model/container/ApplicationContainerCluster.java  | 4 +++-
 .../yahoo/vespa/model/container/configserver/ConfigserverCluster.java | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'config-model/src/main/java')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index 69accef2fe4..5d60cec0679 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -65,8 +65,7 @@ public class ClusterControllerContainer extends Container implements
                    "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StateRestApiV2Handler",
                    "/cluster/v2/*",
                    CLUSTERCONTROLLER_BUNDLE);
-        addComponent(new AccessLogComponent(containerCluster().orElse(null),
-                                            AccessLogComponent.AccessLogType.jsonAccessLog,
+        addComponent(new AccessLogComponent(containerCluster().orElse(null), AccessLogComponent.AccessLogType.jsonAccessLog,
                                             deployState.featureFlags().logFileCompressionAlgorithm("zstd"),
                                             Optional.of("controller"),
                                             deployState.isHosted()));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index c0182c2f5ac..ec1776730b8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -31,6 +31,7 @@ import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
 import com.yahoo.vespa.model.AbstractService;
+import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainer;
 import com.yahoo.vespa.model.container.component.BindingPattern;
 import com.yahoo.vespa.model.container.component.Component;
@@ -38,6 +39,7 @@ import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
 import com.yahoo.vespa.model.utils.FileSender;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -314,8 +316,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
                                    ! previousHosts.contains(container.getHostName()))
                          .retired(container.isRetired());
             builder.server(serverBuilder);
+            builder.dynamicReconfiguration(true);
         }
-        builder.dynamicReconfiguration(true);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 8f257110a04..a165b4862b5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -84,8 +84,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.hostedVespa().orElse(false)) {
             builder.vespaTlsConfigFile(Defaults.getDefaults().underVespaHome("var/zookeeper/conf/tls.conf.json"));
         }
-
-        builder.dynamicReconfiguration(options.hostedVespa().orElse(false));
     }
 
     @Override
-- 
cgit v1.2.3