diff options
| author | Michael J Fork <mjfork@us.ibm.com> | 2013-03-28 11:57:29 +0000 |
|---|---|---|
| committer | Michael J Fork <mjfork@us.ibm.com> | 2013-03-28 11:59:30 +0000 |
| commit | 6ff9c9effe011cb7d8d5479ec8cd2f6c7f61705c (patch) | |
| tree | 0d45e64e13683bf2bfb4390ad2245628f71310ef | |
| parent | 7bf541cc907bd0e4c881a1bdbd6a14fd7146a5f9 (diff) | |
sync oslo db/sqlalchemy module
sync oslo db/sqlalchemy module to grab "Mark sql_connection with secret
flag" change.
fixes bug 1160680
Change-Id: Id48419624c41eea5a0f2e130d7cdbe8a8f0a9118
| -rw-r--r-- | nova/openstack/common/db/sqlalchemy/session.py | 3 | ||||
| -rw-r--r-- | nova/openstack/common/db/sqlalchemy/utils.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/openstack/common/db/sqlalchemy/session.py b/nova/openstack/common/db/sqlalchemy/session.py index cf6713581..010254e7a 100644 --- a/nova/openstack/common/db/sqlalchemy/session.py +++ b/nova/openstack/common/db/sqlalchemy/session.py @@ -264,7 +264,8 @@ sql_opts = [ os.path.abspath(os.path.join(os.path.dirname(__file__), '../', '$sqlite_db')), help='The SQLAlchemy connection string used to connect to the ' - 'database'), + 'database', + secret=True), cfg.StrOpt('sqlite_db', default='nova.sqlite', help='the filename to use with sqlite'), diff --git a/nova/openstack/common/db/sqlalchemy/utils.py b/nova/openstack/common/db/sqlalchemy/utils.py index 6a9cb846f..3f5ae737a 100644 --- a/nova/openstack/common/db/sqlalchemy/utils.py +++ b/nova/openstack/common/db/sqlalchemy/utils.py @@ -2,7 +2,7 @@ # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. -# Copyright 2010-2011 OpenStack Foundation +# Copyright 2010-2011 OpenStack Foundation. # Copyright 2012 Justin Santa Barbara # All Rights Reserved. # |