Merge "Use oslo db.sqlalchemy.session.EngineFacade.from_config"

2014-03-22 13:48:21 +00:00
parent a3c755380f 672ca17be7
commit 1e84251c87
1 changed files with 2 additions and 3 deletions
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -174,9 +174,8 @@ def _get_engine_facade():
    global _engine_facade

    if not _engine_facade:
-        _engine_facade = db_session.EngineFacade(
-            CONF.database.connection,
-            **dict(six.iteritems(CONF.database)))
+        _engine_facade = db_session.EngineFacade.from_config(
+            CONF.database.connection, CONF)

    return _engine_facade