Remove ClusterMemberInfoConfig

4 files changed, 1 insertions, 25 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index b015e25f7ea..8e2c6b8532d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container;
 
-import com.yahoo.cloud.config.ClusterMemberInfoConfig;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
@@ -49,8 +48,7 @@ public class Container extends AbstractService implements
         ComponentsConfig.Producer,
         JdiscBindingsConfig.Producer,
         ContainerHttpConfig.Producer,
-        ContainerMbusConfig.Producer,
-        ClusterMemberInfoConfig.Producer {
+        ContainerMbusConfig.Producer {
 
     public static final int BASEPORT = Defaults.getDefaults().vespaWebServicePort();
     public static final String SINGLENODE_CONTAINER_SERVICESPEC = "default_singlenode_container";
@@ -381,12 +379,6 @@ public class Container extends AbstractService implements
     }
 
     @Override
-    public void getConfig(ClusterMemberInfoConfig.Builder builder) {
-        builder.clusterId(clusterName);
-        builder.index(index);
-    }
-
-    @Override
     public HashMap<String,String> getDefaultMetricDimensions(){
         HashMap<String, String> dimensions = new HashMap<>();
         if (clusterName != null)
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 96a48acb72b..15819b6bd47 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -12,8 +12,6 @@ vespa_generate_config(configdefinitions cluster-info.def)
 install(FILES cluster-info.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions cluster-list.def)
 install(FILES cluster-list.def DESTINATION var/db/vespa/config_server/serverdb/classes)
-vespa_generate_config(configdefinitions cluster-member-info.def)
-install(FILES cluster-member-info.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions configserver.def)
 install(FILES configserver.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions dispatch.def)
diff --git a/configdefinitions/src/vespa/cluster-member-info.def b/configdefinitions/src/vespa/cluster-member-info.def
deleted file mode 100644
index 7c94a339bd1..00000000000
--- a/configdefinitions/src/vespa/cluster-member-info.def
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# Information about a given node's (the node receiving the config) membership in a cluster. See also cluster-info
-namespace=cloud.config
-
-# the id of the cluster this node is a member of
-clusterId string
-
-# The unique index of this node in the cluster.
-# Node indexes are not necessarily continuous and starting at zero.
-index int
-
-
-
diff --git a/install_java.cmake b/install_java.cmake
index 79aa927df24..a0fb98a12ae 100644
--- a/install_java.cmake
+++ b/install_java.cmake
@@ -91,7 +91,6 @@ install(FILES
     configdefinitions/src/vespa/attributes.def
     configdefinitions/src/vespa/cluster-info.def
     configdefinitions/src/vespa/cluster-list.def
-    configdefinitions/src/vespa/cluster-member-info.def
     configdefinitions/src/vespa/configserver.def
     configdefinitions/src/vespa/fleetcontroller.def
     configdefinitions/src/vespa/ilscripts.def