diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-18 18:02:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-18 18:02:35 +0000 |
| commit | 9a4075334bea85b675774520bff15fb97f5c90a0 (patch) | |
| tree | ed951ea431c190a026c462b74516e8055037b196 /openstackclient/common | |
| parent | 0ef8535036c3739d798fd5627ae142d121f20d42 (diff) | |
| parent | e51a8d63747932f2ee4ffab02dfb0cd43e4a103d (diff) | |
| download | python-openstackclient-9a4075334bea85b675774520bff15fb97f5c90a0.tar.gz | |
Merge "Use project_domain_id only in password auth"
Diffstat (limited to 'openstackclient/common')
| -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 d6297753..1ac53f7f 100644 --- a/openstackclient/common/client_config.py +++ b/openstackclient/common/client_config.py @@ -151,6 +151,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') ): |