openstack/python-openstackclient
Code Issues Proposed changes

Ignore domain related config when using with keystone v2

Browse Source 
Currently, "/usr/bin/openstack --insecure token issue"
fails when OS_AUTH_URL and OS_IDENTITY_API_VERSION
indicate keystone v2 if OS_PROJECT_DOMAIN_NAME or
OS_USER_DOMAIN_NAME are set. This patchset ignore domain
related configs if using with keystone v2 and print warning
for each ignored config.

Change-Id: I8afbda787df7855c3f8e868b0f07cbf3b9cd97fd
Closes-bug: #1447704
This commit is contained in:
Hieu LE 2016-05-09 12:29:44 +07:00
parent 4cd702c361
commit b8432408e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/common/clientmanager.py
View File

@ -200,12 +200,12 @@ class ClientManager(object):
# ignore all domain related configs. # ignore all domain related configs.
if (self._api_version.get('identity') == '2.0' and if (self._api_version.get('identity') == '2.0' and
self.auth_plugin_name.endswith('password')): 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', domain_props = ['project_domain_name', 'project_domain_id',
'user_domain_name', 'user_domain_id'] 'user_domain_name', 'user_domain_id']
for prop in domain_props: 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 # For compatibility until all clients can be updated
if 'project_name' in self._auth_params: if 'project_name' in self._auth_params: