X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmframework%2Fsrc%2Fcmframework%2Futils%2Fcmansibleinventory.py;h=a940f78aa5d39f14d0c23f3c5eb9bb32e81293a1;hb=e6ced6ae49adb3f8a0d4a9051e8364265aabda4b;hp=4bd982431586e41d583b40e1a8c75f3cc73d0bd8;hpb=04ffd0a9c00d4b58fb5e82825a4c7cdec5b42467;p=ta%2Fconfig-manager.git

diff --git a/cmframework/src/cmframework/utils/cmansibleinventory.py b/cmframework/src/cmframework/utils/cmansibleinventory.py
index 4bd9824..a940f78 100644
--- a/cmframework/src/cmframework/utils/cmansibleinventory.py
+++ b/cmframework/src/cmframework/utils/cmansibleinventory.py
@@ -79,6 +79,10 @@ class AnsibleInventory(object):
         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:
@@ -91,6 +95,11 @@ class AnsibleInventory(object):
         ips.append(hostvars[node]['ansible_host'])
         hostvars[node]['ssl_alt_name']['ip'] = ips
 
+        caasconf = self.confman.get_caas_config_handler()
+        hostvars[node]['system_reserved_memory'] = hostsconf.get_system_reserved_memory(node)
+        hostvars[node]['caas_soft_eviction_threshold'] = caasconf.get_caas_soft_eviction_threshold()
+        hostvars[node]['caas_hard_eviction_threshold'] = caasconf.get_caas_hard_eviction_threshold()
+
     def set_caas_master_data(self, hostvars, node, caasconf, hostsconf):
         dns = hostvars[node]['ssl_alt_name']['dns']
         dns.append(caasconf.get_kubernetes_domain())