X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=inventoryhandlers%2Fopenstack%2Fopenstackinventory.py;h=a8e8679febee93c584fbe463cbf610ac9a2cd7e1;hb=c2a621b8d4e7fbde09b46f2edfcc85fba5d37a75;hp=1f6ee81f979e57053b73556b25ab4c569eea906a;hpb=a7a7b7b7429a60e9ee34459857862e7e64e8d306;p=ta%2Fcm-plugins.git

diff --git a/inventoryhandlers/openstack/openstackinventory.py b/inventoryhandlers/openstack/openstackinventory.py
index 1f6ee81..a8e8679 100644
--- a/inventoryhandlers/openstack/openstackinventory.py
+++ b/inventoryhandlers/openstack/openstackinventory.py
@@ -1137,6 +1137,7 @@ class Host:
         self.hwmgmt_address = None
         self.hwmgmt_password = None
         self.hwmgmt_user = None
+        self.hwmgmt_priv_level = 'ADMINISTRATOR'
         self.mgmt_mac = None
         self.is_performance = False
         self.os_max_threads = 16
@@ -1427,6 +1428,7 @@ class openstackinventory(cmansibleinventoryconfig.CMAnsibleInventoryConfigPlugin
         host.hwmgmt_address = hostsconf.get_hwmgmt_ip(name)
         host.hwmgmt_user = hostsconf.get_hwmgmt_user(name)
         host.hwmgmt_password = hostsconf.get_hwmgmt_password(name)
+        host.hwmgmt_priv_level = hostsconf.get_hwmgmt_priv_level(name)
         host.mgmt_mac = hostsconf.get_mgmt_mac(name)
 
 
@@ -1503,7 +1505,7 @@ class openstackinventory(cmansibleinventoryconfig.CMAnsibleInventoryConfigPlugin
         self.general.password = usersconf.get_admin_user_password()
         caas_conf = self.confman.get_caas_config_handler()
         if caas_conf.get_caas_only():
-          self.general.openstack_password = usersconf.get_admin_password()
+          self.general.openstack_password = caas_conf.get_admin_password()
         else:
           openstackconfighandler = self.confman.get_openstack_config_handler()
           self.general.openstack_password = openstackconfighandler.get_admin_password()