X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fhosts%2Fconfig.py;h=df31dc192d8ac9a9ada3b7ff97994e5a3baa4faf;hb=d819149d39c7f26a15c81f514adc2f9127db37c4;hp=06f556f54ecad4c157b80ba5e76cc8a05d35a6cc;hpb=6304ee33ecdd870a39781b9adb273d6b8f4f7802;p=ta%2Fconfig-manager.git

diff --git a/cmdatahandlers/src/cmdatahandlers/hosts/config.py b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
index 06f556f..df31dc1 100644
--- a/cmdatahandlers/src/cmdatahandlers/hosts/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
@@ -168,12 +168,10 @@ class Config(config.Config):
         return sorted(self.config[self.ROOT].keys())
 
     def get_labels(self, hostname):
-        noderole_label = "node.kubernetes.io/{}".format(self.get_noderole(hostname))
         mandatory_labels = \
             {"nodetype": self.get_nodetype(hostname),
              "nodeindex": self.get_nodeindex(hostname),
-             "nodename": self.get_nodename(hostname),
-             noderole_label: ""}
+             "nodename": self.get_nodename(hostname)}
         labels = self.config[self.ROOT][hostname].get('labels', {}).copy()
         labels.update(mandatory_labels)
 
@@ -196,6 +194,11 @@ class Config(config.Config):
 
         return service_profiles[0]
 
+    def set_noderole(self):
+        hosts = self.get_hosts()
+        for host in hosts:
+            self.config[self.ROOT][host]['noderole'] = self.get_noderole(host)
+
     def set_nodeindex(self):
         hostsconf = self.confman.get_hosts_config_handler()
         install_host = utils.get_installation_host_name(hostsconf)