diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-09 15:52:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-09 15:52:24 +0000 |
| commit | c3acc4175b8708dc2f23c5b20e733a7f1be31ea6 (patch) | |
| tree | 6f89f120d673777c48f8b51f6996ffd0d9c694a4 /openstackclient | |
| parent | 3f5fd2f9e1b341bf9dfff8643a376430f1adbaba (diff) | |
| parent | b8432408e68855d7ce9269b7e681de3c5b733b09 (diff) | |
| download | python-openstackclient-c3acc4175b8708dc2f23c5b20e733a7f1be31ea6.tar.gz | |
Merge "Ignore domain related config when using with keystone v2"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index c29bf224..9c2b320c 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -200,12 +200,12 @@ class ClientManager(object): # ignore all domain related configs. if (self._api_version.get('identity') == '2.0' and self.auth_plugin_name.endswith('password')): - LOG.warning("Ignoring domain related configs " - "because identity API version is 2.0") domain_props = ['project_domain_name', 'project_domain_id', 'user_domain_name', 'user_domain_id'] for prop in domain_props: - self._auth_params.pop(prop, None) + if self._auth_params.pop(prop, None) is not None: + LOG.warning("Ignoring domain related configs " + + prop + " because identity API version is 2.0") # For compatibility until all clients can be updated if 'project_name' in self._auth_params: |