Support new conf refactor from Nova

The core nova project is consolidating their conf options.  This
impacted the PowerVM conf options as a few that we were explicitly
importing were moved.

This change set fixes the issue and allows PowerVM to work properly.

The change actually removes the imports, but they are still imported
properly because the PowerVM driver imports the 'nova.conf' package
(which will background load the parameters).

Change-Id: I93c46e74a09cac332b903adeddbd20e859b4b7f5
Closes-Bug: 1578318
This commit is contained in:
Drew Thorstensen
2016-05-04 13:49:10 -04:00
parent a6e27ee10a
commit 053d4599db

View File

@@ -20,10 +20,4 @@ from nova_powervm.conf import powervm
CONF = nova.conf.CONF
# Pull in the imports that nova-powervm uses so they are validated
CONF.import_opt('host', 'nova.netconf')
CONF.import_opt('my_ip', 'nova.netconf')
CONF.import_opt('vif_plugging_is_fatal', 'nova.virt.driver')
CONF.import_opt('vif_plugging_timeout', 'nova.virt.driver')
powervm.register_opts(CONF)