Merge "Kubernetes memory parameter"

diff --combined cmframework/src/cmframework/utils/cmansibleinventory.py
index 4bd9824,8757426..f21fa0b
--- 1/cmframework/src/cmframework/utils/cmansibleinventory.py
--- 2/cmframework/src/cmframework/utils/cmansibleinventory.py
+++ b/cmframework/src/cmframework/utils/cmansibleinventory.py
@@@ -91,6 -91,11 +91,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())
@@@ -232,7 -237,7 +237,7 @@@
              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():