openstack
/
cinder
Code Issues Proposed changes

Log config options with oslo.config 

This removes some custom Cinder code which
handles filtering secret config options in a flaky way.

Filtering will now be based on the "secret=True" option
flag.

Related-Bug: #1750074
Change-Id: I1c404b057d1471c85bd7eaf5c096f5912293460a
(cherry picked from commit 7d278042c5)
(cherry picked from commit 4bc52eb7ba)
This commit is contained in:
Eric Harney 2018-02-21 14:27:11 -05:00
parent c10a5629a2
commit 9ba486370b
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/service.py
View File

@ -646,18 +646,8 @@ def serve(server, workers=None):
def wait():
LOG.debug('Full set of CONF:')
for flag in CONF:
flag_get = CONF.get(flag, None)
# hide flag contents from log if contains a password
# should use secret flag when switch over to openstack-common
if ("_password" in flag or "_key" in flag or
(flag == "sql_connection" and
("mysql:" in flag_get or "postgresql:" in flag_get))):
LOG.debug('%s : FLAG SET ', flag)
else:
LOG.debug('%(flag)s : %(flag_get)s',
{'flag': flag, 'flag_get': flag_get})
CONF.log_opt_values(LOG, logging.DEBUG)
try:
_launcher.wait()
except KeyboardInterrupt: