summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-04 13:47:01 +0000
committerGerrit Code Review <review@openstack.org>2016-01-04 13:47:01 +0000
commitcee6bbdb313069f529973bcfd0b363e46e835e85 (patch)
treecfab4e5d8f8c88951b223adf12bdad0277f0106f
parent8b89907d59c500fc2dd503ba3c77376f28444949 (diff)
parentc514b855d1faed8947ace885bb4656da541d4d2b (diff)
downloados-client-config-cee6bbdb313069f529973bcfd0b363e46e835e85.tar.gz
Merge "Debug log a deferred keystone exception, else we mask some useful diag"
-rw-r--r--os_client_config/config.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index b572645..d490006 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -26,6 +26,7 @@ from keystoneauth1 import adapter
from keystoneauth1 import loading
import yaml
+from os_client_config import _log
from os_client_config import cloud_config
from os_client_config import defaults
from os_client_config import exceptions
@@ -170,6 +171,8 @@ class OpenStackConfig(object):
def __init__(self, config_files=None, vendor_files=None,
override_defaults=None, force_ipv4=None,
envvar_prefix=None, secure_files=None):
+ self.log = _log.setup_logging(__name__)
+
self._config_files = config_files or CONFIG_FILES
self._secure_files = secure_files or SECURE_FILES
self._vendor_files = vendor_files or VENDOR_FILES
@@ -920,6 +923,7 @@ class OpenStackConfig(object):
# but OSC can't handle it right now, so we try deferring
# to ksc. If that ALSO fails, it means there is likely
# a deeper issue, so we assume the ksa error was correct
+ self.log.debug("Deferring keystone exception: {e}".format(e=e))
auth_plugin = None
try:
config = self._validate_auth_ksc(config)