openstack/deb-python-openstackclient
Code Issues Proposed changes

Merge "Use project_domain_id only in password auth"

Browse Source
This commit is contained in:
Jenkins
2016-11-18 18:02:35 +00:00
committed by Gerrit Code Review
parent 0ef8535036 e51a8d6374
commit 9a4075334b
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstackclient/common/client_config.py
View File

@@ -151,6 +151,7 @@ class OSC_Config(config.OpenStackConfig):
# present, then do not change the behaviour. Otherwise, set the # present, then do not change the behaviour. Otherwise, set the
# PROJECT_DOMAIN_ID to 'OS_DEFAULT_DOMAIN' for better usability. # PROJECT_DOMAIN_ID to 'OS_DEFAULT_DOMAIN' for better usability.
if ( if (
auth_type in ("password", "v3password", "v3totp") and
not config['auth'].get('project_domain_id') and not config['auth'].get('project_domain_id') and
not config['auth'].get('project_domain_name') not config['auth'].get('project_domain_name')
): ):