summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael J Fork <mjfork@us.ibm.com>2013-03-28 03:09:58 +0000
committerMichael J Fork <mjfork@us.ibm.com>2013-03-28 03:10:55 +0000
commitee0e4be91ea6010bebed3a63e531f24063dcfa4c (patch)
treed31df631b7fc1219a1707261dc4265ae65e8a3aa
parentbbc0f1453c436d8898eaa0be975b0482e5d7bf84 (diff)
downloadkeystone-ee0e4be91ea6010bebed3a63e531f24063dcfa4c.tar.gz
keystone-ee0e4be91ea6010bebed3a63e531f24063dcfa4c.tar.xz
keystone-ee0e4be91ea6010bebed3a63e531f24063dcfa4c.zip
Mark sql connection with secret flag
sql connection parameter contains the password in some setups and marking as secret prevents accidental logging fixes bug 1160680 Change-Id: I093d9c6556197ec25cb63bf16bcc90bb9679fed0
-rw-r--r--keystone/common/config.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py
index bcfc347c..a96c814e 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -235,7 +235,8 @@ def configure():
register_str('ca_password', group='signing', default=None)
# sql
- register_str('connection', group='sql', default='sqlite:///keystone.db')
+ register_str('connection', group='sql', secret=True,
+ default='sqlite:///keystone.db')
register_int('idle_timeout', group='sql', default=200)
register_str(