Fix tests to work in debug mode

Avoid oslo.cfg errors when running the tests in debug mode, with
run_tests.sh -d, or directly with testtools.

Change-Id: I7c8b24673ac2d502b219a00ce8af93111348b1ff

diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py
index dbf8d08c783b9b7ce2e4733c8f1129b4cf5d8be9..841ec379124a4ca026814dd952a63da31e497c1c 100644 (file)
--- a/cinder/tests/conf_fixture.py
+++ b/cinder/tests/conf_fixture.py
@@ -27,6 +27,7 @@ CONF.import_opt('policy_file', 'cinder.policy')
 CONF.import_opt('volume_driver', 'cinder.volume.manager')
 CONF.import_opt('xiv_ds8k_proxy', 'cinder.volume.drivers.xiv_ds8k')
 CONF.import_opt('backup_driver', 'cinder.backup.manager')
+CONF.import_opt('fixed_key', 'cinder.keymgr.conf_key_mgr', group='keymgr')
 
 def_vol_type = 'fake_vol_type'
 
@@ -48,6 +49,4 @@ def set_defaults(conf):
         'xiv_ds8k_proxy',
         'cinder.tests.test_xiv_ds8k.XIVDS8KFakeProxyDriver')
     conf.set_default('backup_driver', 'cinder.tests.backup.fake_service')
-    # NOTE(joel-coffman): This option for the ConfKeyManager must be set or
-    # else the ConfKeyManager cannot be instantiated.
     conf.set_default('fixed_key', default='0' * 64, group='keymgr')