Kubernetes node role refactored.

Change-Id: Iffa2cc30ce13a5e36817966b809e568dca7a4999
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index 7a2afb2..12059c2 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -83,6 +83,7 @@ class Config(config.Config):
             self.set_caas_parameter('log_forwarding', [])
         hostsconf = self.confman.get_hosts_config_handler()
         hostsconf.set_nodeindex()
             self.set_caas_parameter('log_forwarding', [])
         hostsconf = self.confman.get_hosts_config_handler()
         hostsconf.set_nodeindex()

+        hostsconf.set_noderole()

 
     def set_static_config(self):
         try:
 
     def set_static_config(self):
         try:

diff --git a/cmdatahandlers/src/cmdatahandlers/hosts/config.py b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
index 6f3deb8..df31dc1 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/hosts/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
@@ -194,6 +194,11 @@ class Config(config.Config):
 
         return service_profiles[0]
 
 
         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)
     def set_nodeindex(self):
         hostsconf = self.confman.get_hosts_config_handler()
         install_host = utils.get_installation_host_name(hostsconf)

diff --git a/cmframework/src/cmframework/utils/cmansibleinventory.py b/cmframework/src/cmframework/utils/cmansibleinventory.py
index a940f78..bf2e66f 100644 (file)
--- a/cmframework/src/cmframework/utils/cmansibleinventory.py
+++ b/cmframework/src/cmframework/utils/cmansibleinventory.py
@@ -79,11 +79,6 @@ class AnsibleInventory(object):
         hostvars[node]['nodetype'] = hostsconf.get_nodetype(node)
         hostvars[node]['nodeindex'] = hostsconf.get_nodeindex(node)
         hostvars[node]['nodename'] = hostsconf.get_nodename(node)
         hostvars[node]['nodetype'] = hostsconf.get_nodetype(node)
         hostvars[node]['nodeindex'] = hostsconf.get_nodeindex(node)
         hostvars[node]['nodename'] = hostsconf.get_nodename(node)

-        if hostsconf.get_nodetype(node) == "caas-master":
-            hostvars[node]['noderole'] = "master"
-        elif hostsconf.get_nodetype(node) == "caas-worker":
-            hostvars[node]['noderole'] = "worker"
-

         host_labels = hostsconf.get_labels(node)
         if host_labels:
             hostvars[node]['labels'] = host_labels
         host_labels = hostsconf.get_labels(node)
         if host_labels:
             hostvars[node]['labels'] = host_labels