Kubernetes node role refactored.

[ta/config-manager.git] / cmdatahandlers / src / cmdatahandlers / hosts / config.py

diff --git a/cmdatahandlers/src/cmdatahandlers/hosts/config.py b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
index 1bd37d8..df31dc1 100644 (file)
--- 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-role.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)