Merge "Mask passwords in debug logs for auth_config_hook"

This commit is contained in:
Jenkins
2016-10-07 01:34:03 +00:00
committed by Gerrit Code Review

View File

@@ -17,6 +17,8 @@ import logging
from os_client_config import config from os_client_config import config
from os_client_config import exceptions as occ_exceptions from os_client_config import exceptions as occ_exceptions
from oslo_utils import strutils
import six
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -180,7 +182,9 @@ class OSC_Config(config.OpenStackConfig):
config = self._auth_v2_ignore_v3(config) config = self._auth_v2_ignore_v3(config)
config = self._auth_default_domain(config) config = self._auth_default_domain(config)
LOG.debug("auth_config_hook(): %s" % config) if LOG.isEnabledFor(logging.DEBUG):
LOG.debug("auth_config_hook(): %s",
strutils.mask_password(six.text_type(config)))
return config return config
def load_auth_plugin(self, config): def load_auth_plugin(self, config):