summaryrefslogtreecommitdiff
path: root/ironic/db/migration.py
diff options
context:
space:
mode:
authorVictor Sergeyev <vsergeyev@mirantis.com>2014-02-25 15:51:49 +0200
committerVictor Sergeyev <vsergeyev@mirantis.com>2014-02-26 21:13:57 +0200
commit9bbea3bf0040eb1138f9e8a8e719039f79c647de (patch)
treec1bd8073e1c74d2995093809a10839e71940e0e8 /ironic/db/migration.py
parent1a57ac47b3fa878d07d7c05bafa6ad20ce5afe9d (diff)
downloadironic-9bbea3bf0040eb1138f9e8a8e719039f79c647de.tar.gz
Sync common db code from Oslo
This sync contains commit - ce69e7f Don't store engine instances in oslo.db - which removed global engine from oslo.db code. So, added code for work with sqla engines and sessions to Ironic - get_engine() and get_session() functions in ironic.db.sqlalchemy.api module. Also this remove database slave connection and tpool features, because they was removed from oslo code. Latest oslo.db commit - 7959826af1f36a4bbc4c466d0d1e0b9efd468649 Change-Id: I14c3b823a8b975d5cd097778f3514cfb1abe2e10
Diffstat (limited to 'ironic/db/migration.py')
-rw-r--r--ironic/db/migration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/db/migration.py b/ironic/db/migration.py
index d4f22508a..2e64cfe1c 100644
--- a/ironic/db/migration.py
+++ b/ironic/db/migration.py
@@ -24,7 +24,7 @@ from ironic.common import utils
CONF = cfg.CONF
CONF.import_opt('backend',
- 'ironic.openstack.common.db.api',
+ 'ironic.openstack.common.db.options',
group='database')
IMPL = utils.LazyPluggable(