From dbdd08466a89f4615a8321aaf70828d8d7341a23 Mon Sep 17 00:00:00 2001
From: Rick Harris <rconradharris@gmail.com>
Date: Wed, 5 Jun 2013 16:20:34 +0000
Subject: 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
---
 nova/test.py | 1 +
 1 file changed, 1 insertion(+)

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')
-- 
cgit