summaryrefslogtreecommitdiffstats
path: root/openstack/common/db/sqlalchemy
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-02-04 16:26:39 +0000
committerMark McLoughlin <markmc@redhat.com>2013-02-05 10:50:53 +0000
commit5ce0a259ec3ca7a67a9534eba3b6499b4aa71f06 (patch)
tree05d690c97f22ada8c235b718081862a520ae0461 /openstack/common/db/sqlalchemy
parent9c264bcc87a2770ff7a119ea9d55790279c0060b (diff)
downloadoslo-5ce0a259ec3ca7a67a9534eba3b6499b4aa71f06.tar.gz
oslo-5ce0a259ec3ca7a67a9534eba3b6499b4aa71f06.tar.xz
oslo-5ce0a259ec3ca7a67a9534eba3b6499b4aa71f06.zip
Be explicit about set_default() parameters
We probably only want to support people using set_defaults() for a limited set of config options, so explicitly list those as parameters to the method. This is what we do for rpc and log options too. Change-Id: I3bfc5355e82eec17480b9547662e847dc0d74138
Diffstat (limited to 'openstack/common/db/sqlalchemy')
-rw-r--r--openstack/common/db/sqlalchemy/session.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py
index a49a5a8..3b2d9df 100644
--- a/openstack/common/db/sqlalchemy/session.py
+++ b/openstack/common/db/sqlalchemy/session.py
@@ -317,9 +317,11 @@ _ENGINE = None
_MAKER = None
-def set_defaults(**kwargs):
+def set_defaults(sql_connection, sqlite_db):
"""Set defaults for configuration variables."""
- cfg.set_defaults(sql_opts, **kwargs)
+ cfg.set_defaults(sql_opts,
+ sql_connection=sql_connection,
+ sqlite_db=sqlite_db)
def get_session(autocommit=True, expire_on_commit=False):