summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-21 12:15:20 +0000
committerMark McLoughlin <markmc@redhat.com>2012-11-21 12:15:20 +0000
commitf324af240105ecce8b18cda97ce8a87a353bc8e5 (patch)
treea03cb8229ae172c5be1db9142d0ee8bccb3879ae /nova/tests
parent9dfb4b420f9d15d348f9fa9a2a0cb1a57f4e5771 (diff)
Move sql options to nova.db.sqlalchemy.session
With a few minor exceptions, the sql config options are used solely within the nova.db.sqlalchemy.session module so it makes sense to move their declaration into that module. Change-Id: Iea9c2bb000cd713b01750ab3e796132ebeaa4ca8
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index d7edb7cf6..6e19e6dc2 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -41,8 +41,8 @@ import eventlet
eventlet.monkey_patch(os=False)
CONF = cfg.CONF
-CONF.import_opt('sql_connection', 'nova.config')
-CONF.import_opt('sqlite_db', 'nova.config')
+CONF.import_opt('sql_connection', 'nova.db.sqlalchemy.session')
+CONF.import_opt('sqlite_db', 'nova.db.sqlalchemy.session')
CONF.import_opt('state_path', 'nova.config')
CONF.set_override('use_stderr', False)