From 6ff9c9effe011cb7d8d5479ec8cd2f6c7f61705c Mon Sep 17 00:00:00 2001 From: Michael J Fork Date: Thu, 28 Mar 2013 11:57:29 +0000 Subject: 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 --- nova/openstack/common/db/sqlalchemy/session.py | 3 ++- nova/openstack/common/db/sqlalchemy/utils.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'nova/openstack') 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. # -- cgit