diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-09 17:59:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-09 17:59:00 +0000 |
| commit | 23f6681de615973b7cf54036b607d9a80da6d929 (patch) | |
| tree | a86e24dfcc537e9018757a42900468c07d4f48e9 /openstackclient | |
| parent | f1c082dd9b9c5d9dc33d9cb5df10fd5330aabe88 (diff) | |
| parent | fc370104156810cb4f65a3235d6bf6ab65f028bd (diff) | |
| download | python-openstackclient-23f6681de615973b7cf54036b607d9a80da6d929.tar.gz | |
Merge "Use project_domain_id only in password auth" into stable/newton
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/client_config.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openstackclient/common/client_config.py b/openstackclient/common/client_config.py index 273d6623..9cc2b3fe 100644 --- a/openstackclient/common/client_config.py +++ b/openstackclient/common/client_config.py @@ -150,6 +150,7 @@ class OSC_Config(config.OpenStackConfig): # present, then do not change the behaviour. Otherwise, set the # PROJECT_DOMAIN_ID to 'OS_DEFAULT_DOMAIN' for better usability. if ( + auth_type in ("password", "v3password", "v3totp") and not config['auth'].get('project_domain_id') and not config['auth'].get('project_domain_name') ): |