Set up components depending on cluster type.

- Remove ClusterVerifier, it's no longer needed.
- Remove tests that are no longer relevant.

1 files changed, 1 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index 0917941bfc3..096189cabfe 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -1,10 +1,10 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin.clustercontroller;
 
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterVerifier;
 
 /**
  * Container cluster for cluster-controller containers.
@@ -14,15 +14,10 @@ import com.yahoo.vespa.model.container.ContainerClusterVerifier;
 public class ClusterControllerContainerCluster extends ContainerCluster<ClusterControllerContainer> implements
         ThreadpoolConfig.Producer
 {
-
     public ClusterControllerContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
         super(parent, subId, name, deployState);
     }
 
-    public ClusterControllerContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, ContainerClusterVerifier verifier, DeployState deployState) {
-        super(parent, subId, name, verifier, deployState);
-    }
-
     @Override
     public void getConfig(ThreadpoolConfig.Builder builder) {
         builder.maxthreads(10);