Remove "subId" ctor parameter from Container subclasses.

- Was always equal to "name".

3 files changed, 5 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
index 1e0c72c6298..f8f515cb609 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
@@ -11,8 +11,8 @@ import com.yahoo.vespa.model.container.component.Handler;
  */
 public class LogserverContainerCluster extends ContainerCluster<LogserverContainer> {
 
-    public LogserverContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
-        super(parent, subId, name, deployState);
+    public LogserverContainerCluster(AbstractConfigProducer<?> parent, String name, DeployState deployState) {
+        super(parent, name, name, deployState);
 
         addDefaultHandlersWithVip();
         addLogHandler();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 587c5447886..18b30f26739 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -11,8 +11,8 @@ import com.yahoo.vespa.model.container.ContainerCluster;
  */
 public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyContainer> {
 
-    public MetricsProxyContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
-        super(parent, subId, name, deployState);
+    public MetricsProxyContainerCluster(AbstractConfigProducer<?> parent, String name, DeployState deployState) {
+        super(parent, name, name, deployState);
         addDefaultHandlersExceptStatus();
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 7d8c219d5ef..f6219e57ff9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -105,7 +105,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     // Creates a container cluster 'logs' with a container on the logserver host
     // that has a handler for getting logs
     private void createContainerOnLogserverHost(DeployState deployState, Admin admin, HostResource hostResource) {
-        LogserverContainerCluster logServerCluster = new LogserverContainerCluster(admin, "logs", "logs", deployState);
+        LogserverContainerCluster logServerCluster = new LogserverContainerCluster(admin, "logs", deployState);
         ContainerModel logserverClusterModel = new ContainerModel(context.withParent(admin).withId(logServerCluster.getSubId()));
         logserverClusterModel.setCluster(logServerCluster);