Adding default user_domain_id parameter only when using

password auth

Change-Id: I31943739cc1b535cbd402c5e9245b2f7a19cfa32
Closes-Bug: #1418810
This commit is contained in:
Igor_Bolotin 2015-02-05 20:14:51 -08:00
parent 0cc3955f0a
commit 4771feb7c4

@ -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