Set username when initializing PhysicalHostMonitorPlugin

PhysicalHostMonitorPlugin fails to set the username parameter during its
initialization, which results in authorization errors when the plugin
calls the Nova API.

Change-Id: I64b9f7c3a97e70acca996c52ff739c6c4397dd8f
Partial-Bug: #1785945
This commit is contained in:
Masahito Muroi 2018-08-08 11:59:21 +09:00 committed by Pierre Riteau
parent 3cdd01a3cd
commit b54d05b958
2 changed files with 3 additions and 0 deletions

View File

@ -669,6 +669,7 @@ class PhysicalHostMonitorPlugin(base.BaseMonitorPlugin,
cls._instance = super(PhysicalHostMonitorPlugin, cls).__new__(cls)
cls._instance.healing_handlers = []
super(PhysicalHostMonitorPlugin, cls._instance).__init__(
username=CONF.os_admin_username,
password=CONF.os_admin_password,
user_domain_name=CONF.os_admin_user_domain_name,
project_name=CONF.os_admin_project_name,

View File

@ -1886,11 +1886,13 @@ class PhysicalHostMonitorPluginTestCase(tests.TestCase):
# reset the singleton at first
host_plugin.PhysicalHostMonitorPlugin._instance = None
self.cfg = self.useFixture(conf_fixture.Config(CONF))
self.cfg.config(os_admin_username='fake-user')
self.cfg.config(os_admin_password='fake-passwd')
self.cfg.config(os_admin_user_domain_name='fake-user-domain')
self.cfg.config(os_admin_project_name='fake-pj-name')
self.cfg.config(os_admin_project_domain_name='fake-pj-domain')
self.host_monitor_plugin = host_plugin.PhysicalHostMonitorPlugin()
self.assertEqual('fake-user', self.host_monitor_plugin.username)
self.assertEqual("fake-passwd", self.host_monitor_plugin.password)
self.assertEqual("fake-user-domain",
self.host_monitor_plugin.user_domain_name)