From 6ed7f6029963906f3e24f58d00c9b760da63cb36 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 22 Jun 2018 09:46:11 +1000 Subject: [PATCH] Add cloud to warning about domain related config When this warning fires you get a bunch of Ignoring domain related config project_domain_name because identity API version is 2.0 Ignoring domain related config user_domain_name because identity API version is 2.0 in the output, but no clue as to what cloud was actually causing the problem to help you debug. This is a bit annoying if you have many different clouds setup in your configuration. Add the name of the cloud to the message. Change-Id: Id2b5133f583f7071745e02001eaeaa3dcee211ba --- osc_lib/cli/client_config.py | 5 +++-- osc_lib/tests/cli/test_client_config.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osc_lib/cli/client_config.py b/osc_lib/cli/client_config.py index 4ae8837..d942108 100644 --- a/osc_lib/cli/client_config.py +++ b/osc_lib/cli/client_config.py @@ -101,8 +101,9 @@ class OSC_Config(config.OpenStackConfig): ] for prop in domain_props: if config['auth'].pop(prop, None) is not None: - LOG.warning("Ignoring domain related config " + - prop + " because identity API version is 2.0") + LOG.warning("Ignoring domain related config %s for %s" + "because identity API version is 2.0" % + (prop, config['cloud'])) return config def _auth_default_domain(self, config): diff --git a/osc_lib/tests/cli/test_client_config.py b/osc_lib/tests/cli/test_client_config.py index 3450f1c..ca197a5 100644 --- a/osc_lib/tests/cli/test_client_config.py +++ b/osc_lib/tests/cli/test_client_config.py @@ -151,6 +151,7 @@ class TestOSCConfig(utils.TestCase): def test_auth_v2_ignore_v3(self): config = { + 'cloud': 'testcloud', 'identity_api_version': '2', 'auth_type': 'v2password', 'auth': {