Do not use RestrictedServerCnxnFactory in self-hosted installations

1 files changed, 5 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
index 8ba85047057..84ca6416269 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.admin.clustercontroller;
 import com.google.common.base.Joiner;
 import com.yahoo.cloud.config.ZookeeperServerConfig;
 import com.yahoo.cloud.config.ZookeepersConfig;
+import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.Service;
 import com.yahoo.vespa.model.admin.Configserver;
@@ -17,7 +18,6 @@ import java.util.Collection;
  * to provide common configs to container components.
  *
  * @author Ulf Lilleengen
- * @since 5.6
  */
 public class ClusterControllerCluster extends AbstractConfigProducer<ClusterControllerContainerCluster> implements
         ZookeeperServerConfig.Producer,
@@ -25,9 +25,11 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont
 
     private static final int ZK_CLIENT_PORT = 2181;
     private ClusterControllerContainerCluster containerCluster = null;
+    private final DeployState deployState;
 
-    public ClusterControllerCluster(AbstractConfigProducer parent, String subId) {
+    public ClusterControllerCluster(AbstractConfigProducer parent, String subId, DeployState deployState) {
         super(parent, subId);
+        this.deployState = deployState;
     }
 
     @Override
@@ -39,6 +41,7 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont
             serverBuilder.id(container.index());
             builder.server(serverBuilder);
         }
+        builder.useRestrictedServerCnxnFactory( ! deployState.isHosted());
     }
 
     @Override