diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-06 23:47:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-06 23:47:13 +0000 |
| commit | 863b50cb6d35f4fdff425941e0f79646968adbf0 (patch) | |
| tree | 797ebd4535f2c5699bf504cb5c1678f4206cd2ab /openstackclient | |
| parent | 5cf3929b035405eccc7d9301535f17d3b98b78dc (diff) | |
| parent | 4771feb7c4af6f718efb2a687c99b3bf5387bb2f (diff) | |
| download | python-openstackclient-863b50cb6d35f4fdff425941e0f79646968adbf0.tar.gz | |
Merge "Adding default user_domain_id parameter only when using password auth"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 2908c8ff..974936f8 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -114,6 +114,7 @@ class ClientManager(object): # then do not change the behaviour. Otherwise, set the USER_DOMAIN_ID # to 'OS_DEFAULT_DOMAIN' for better usability. 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_name')): self._auth_params['user_domain_id'] = default_domain |