Remove ConfigServerConfig

3 files changed, 1 insertions, 24 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
index 7b484dfc481..d7dc0c7c6ee 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/ConfigServerInfo.java
@@ -2,8 +2,6 @@
 package com.yahoo.vespa.hosted.node.admin.component;
 
 import com.yahoo.vespa.athenz.api.AthenzService;
-import com.yahoo.vespa.athenz.utils.AthenzIdentities;
-import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -19,20 +17,12 @@ import static java.util.stream.Collectors.toMap;
  * @author hakon
  */
 public class ConfigServerInfo {
-    private final List<String> configServerHostNames;
     private final URI loadBalancerEndpoint;
     private final Map<String, URI> configServerURIs;
     private final AthenzService configServerIdentity;
 
-    // TODO: Remove
-    public ConfigServerInfo(ConfigServerConfig config) {
-        this(config.loadBalancerHost(), config.hosts(), config.scheme(), config.port(),
-                (AthenzService) AthenzIdentities.from(config.configserverAthenzIdentity()));
-    }
-
     public ConfigServerInfo(String loadBalancerHostName, List<String> configServerHostNames,
                             String scheme, int port, AthenzService configServerAthenzIdentity) {
-        this.configServerHostNames = configServerHostNames;
         this.configServerURIs = createConfigServerUris(scheme, configServerHostNames, port);
         this.loadBalancerEndpoint = createLoadBalancerEndpoint(loadBalancerHostName, scheme, port);
         this.configServerIdentity = configServerAthenzIdentity;
@@ -43,7 +33,7 @@ public class ConfigServerInfo {
     }
 
     public List<String> getConfigServerHostNames() {
-        return configServerHostNames;
+        return new ArrayList<>(configServerURIs.keySet());
     }
 
     public List<URI> getConfigServerUris() {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/config/package-info.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/config/package-info.java
deleted file mode 100644
index 15cfa99c749..00000000000
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/config/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.vespa.hosted.node.admin.config;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/node-admin/src/main/resources/configdefinitions/config-server.def b/node-admin/src/main/resources/configdefinitions/config-server.def
deleted file mode 100644
index 6a088829bad..00000000000
--- a/node-admin/src/main/resources/configdefinitions/config-server.def
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.hosted.node.admin.config
-
-hosts[]                      string
-port                         int                         default=8080 range=[1,65535]
-scheme                       string                      default="http"
-loadBalancerHost             string                      default=""
-configserverAthenzIdentity   string                      default="vespa.configserver"
\ No newline at end of file