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

diff --git a/cmframework/src/cmframework/utils/cmansibleinventory.py b/cmframework/src/cmframework/utils/cmansibleinventory.py
index eef17db..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,9 +95,14 @@ 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('kubernetes.default.svc.nokia.net')
+        dns.append(caasconf.get_kubernetes_domain())
         dns.append(caasconf.get_apiserver_in_hosts())
         dns.append(caasconf.get_registry_url())
         dns.append(caasconf.get_update_registry_url())
@@ -232,7 +241,7 @@ class AnsibleInventory(object):
             plugins = self.pluginloader.get_plugin_instances(self.confman, inventory, ownhost)
             if self._is_setup():
                 inventory.clear()
-            for name, plugin in plugins.iteritems():
+            for name, plugin in sorted(plugins.iteritems()):
                 if self._is_bootstrapping():
                     plugin.handle_bootstrapping()
                 elif self._is_provisioning():