summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2013-05-15 21:23:05 -0500
committerBrant Knudson <bknudson@us.ibm.com>2013-06-06 16:54:10 -0500
commit02fefdf434c9f3ccd0b2fe95645d58065dbae0ce (patch)
treeaf2114889e4d972085007af07c4fc3f4e0dfc3b8 /keystone
parent316f059a0e18e705c0fe276f181445b05ba087ea (diff)
Pass on arguments on Base.get_session
This change makes it so that the arguments for the session creation function get_session() get passed on when it calls the function to create the session. Change-Id: I2f889ab36bd3aa3bf4441a13eb2b610b54349cbb
Diffstat (limited to 'keystone')
-rw-r--r--keystone/common/sql/core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index e1bd138e..52eee634 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -214,7 +214,8 @@ class Base(object):
self._engine = self._engine or self.get_engine()
self._sessionmaker = self._sessionmaker or self.get_sessionmaker(
self._engine)
- return self._sessionmaker()
+ return self._sessionmaker(autocommit=autocommit,
+ expire_on_commit=expire_on_commit)
def get_engine(self, allow_global_engine=True):
"""Return a SQLAlchemy engine.