From 672ca17be7bb64af22390c88876fa09a7839ed18 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Wed, 5 Mar 2014 17:48:57 -0600
Subject: [PATCH] Use oslo db.sqlalchemy.session.EngineFacade.from_config

Rather than passing the CONF dict to EngineFacade, Keystone can
use the new from_config factory function.

Change-Id: I60f30254431b512988a0f1811b3c119207b91ad7
---
 keystone/common/sql/core.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 43bd647d33..0523675e3b 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -173,9 +173,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