summaryrefslogtreecommitdiffstats
path: root/nova/test.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-06 15:10:18 +0000
committerGerrit Code Review <review@openstack.org>2013-06-06 15:10:18 +0000
commit0d81ea487fa470d928da7481d5a455ed918be6aa (patch)
treeb6966ffb8083d1096db7bd36d7809beae8f8fb6b /nova/test.py
parent8b632660aff27582c9b8ced3e0642399f3139f81 (diff)
parentdbdd08466a89f4615a8321aaf70828d8d7341a23 (diff)
downloadnova-0d81ea487fa470d928da7481d5a455ed918be6aa.tar.gz
nova-0d81ea487fa470d928da7481d5a455ed918be6aa.tar.xz
nova-0d81ea487fa470d928da7481d5a455ed918be6aa.zip
Merge "Import osapi_v3/enabled option in nova/test"
Diffstat (limited to 'nova/test.py')
-rw-r--r--nova/test.py1
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')