diff options
| author | Rick Harris <rconradharris@gmail.com> | 2013-06-05 16:20:34 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2013-06-05 22:01:53 +0000 |
| commit | dbdd08466a89f4615a8321aaf70828d8d7341a23 (patch) | |
| tree | 334b010f681d945b145bd149df269e9920c26930 /nova/test.py | |
| parent | 7a1b7ff57086fc134ea4f329e7b268b125e503a2 (diff) | |
| download | nova-dbdd08466a89f4615a8321aaf70828d8d7341a23.tar.gz nova-dbdd08466a89f4615a8321aaf70828d8d7341a23.tar.xz nova-dbdd08466a89f4615a8321aaf70828d8d7341a23.zip | |
Import osapi_v3/enabled option in nova/test
Since `nova/api/openstack` may not have been imported by the time we use this
option in `nova/test`, we need to explicitly import it at the top of the file.
Fixes bug 1187847
Change-Id: Ibc9f3466d3baaf47d44bda2fc22247a494809909
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/test.py b/nova/test.py index 41ef26c81..f0dba7c7c 100644 --- a/nova/test.py +++ b/nova/test.py @@ -61,6 +61,7 @@ CONF.register_opts(test_opts) CONF.import_opt('sql_connection', 'nova.openstack.common.db.sqlalchemy.session') CONF.import_opt('sqlite_db', 'nova.openstack.common.db.sqlalchemy.session') +CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v3') CONF.set_override('use_stderr', False) logging.setup('nova') |