diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-06 14:41:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-06 14:41:47 +0000 |
| commit | e7c973ed8d708cf950acb25612b646260bccaca0 (patch) | |
| tree | 556391ddd9a1ba9c5a7f94ff591b02e9732a6a02 /openstack | |
| parent | 906bdb404b5061fbce141c27f7dd0d59817402f9 (diff) | |
| parent | 5ce0a259ec3ca7a67a9534eba3b6499b4aa71f06 (diff) | |
| download | oslo-e7c973ed8d708cf950acb25612b646260bccaca0.tar.gz oslo-e7c973ed8d708cf950acb25612b646260bccaca0.tar.xz oslo-e7c973ed8d708cf950acb25612b646260bccaca0.zip | |
Merge "Be explicit about set_default() parameters"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 6 |
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): |