From 2113fe1832a305ccaf1093ccf866adbd20d2f5ac Mon Sep 17 00:00:00 2001
From: Michael J Fork <mjfork@us.ibm.com>
Date: Thu, 28 Mar 2013 02:58:04 +0000
Subject: [PATCH] Mark sql_connection with secret flag

sql_connection contains the password in some setups and marking as
secret prevents accidental logging

fixes bug 1160680

Change-Id: I3704237d0923bb30138b5ece7e5c7bbda0a78b9b
(cherry picked from commit 9f8ee9d2981c5f317139e3743385b59956546d65)
---
 cinder/flags.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cinder/flags.py b/cinder/flags.py
index d82e1ca8a50..27e5b41b42d 100644
--- a/cinder/flags.py
+++ b/cinder/flags.py
@@ -81,7 +81,8 @@ def _get_my_ip():
     cfg.StrOpt('sql_connection',
                default='sqlite:///$state_path/$sqlite_db',
                help='The SQLAlchemy connection string used to connect to the '
-                    'database'),
+                    'database',
+               secret=True),
     cfg.IntOpt('sql_connection_debug',
                default=0,
                help='Verbosity of SQL debugging information. 0=None, '