openstack/python-openstackclient
Code Issues Proposed changes

Merge "Adding default user_domain_id parameter only when using password auth"

Browse Source
This commit is contained in:
Jenkins 2015-02-06 23:47:13 +00:00 committed by Gerrit Code Review
commit 863b50cb6d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstackclient/common/clientmanager.py
View File

@ -114,6 +114,7 @@ class ClientManager(object):
# then do not change the behaviour. Otherwise, set the USER_DOMAIN_ID # then do not change the behaviour. Otherwise, set the USER_DOMAIN_ID
# to 'OS_DEFAULT_DOMAIN' for better usability. # to 'OS_DEFAULT_DOMAIN' for better usability.
if (self._api_version.get('identity') == '3' and if (self._api_version.get('identity') == '3' and
self.auth_plugin_name.endswith('password') and
not self._auth_params.get('user_domain_id') and not self._auth_params.get('user_domain_id') and
not self._auth_params.get('user_domain_name')): not self._auth_params.get('user_domain_name')):
self._auth_params['user_domain_id'] = default_domain self._auth_params['user_domain_id'] = default_domain