openstack
/
osc-lib
Code Issues Proposed changes

Merge "Add cloud to warning about domain related config"

This commit is contained in:
Zuul 2018-07-09 00:18:02 +00:00 committed by Gerrit Code Review
parent fd9c0e8ab9 6ed7f60299
commit 471d7382fb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc_lib/cli/client_config.py
View File

@ -94,8 +94,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):

1
osc_lib/tests/cli/test_client_config.py
View File

@ -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': {