summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorBoris Bobrov <bbobrov@mirantis.com>2016-11-17 13:46:21 +0300
committerBoris Bobrov <bbobrov@mirantis.com>2016-11-18 13:52:58 +0000
commite51a8d63747932f2ee4ffab02dfb0cd43e4a103d (patch)
tree0e69ebf41b5c952d4daa5ec29df0ce3aed1e6888 /openstackclient
parent6eef3277f5b3ebcceded9963627b78b2307621a9 (diff)
downloadpython-openstackclient-e51a8d63747932f2ee4ffab02dfb0cd43e4a103d.tar.gz
Use project_domain_id only in password auth
The method being changed constructs domain-related parameters that will further be passed to the auth plugin. If project domain is not passed, the method sets it to the default domain. token_endpoint does not expect any information about domain, because it uses only a token and URL. Passing it to auth plugin causes an exception. Construct domain-related parameters only for specific plugins, such as password or totp. Change-Id: I13db3bbe31a0ed843e9f4528d37c768546e2bee9 Closes-Bug: 1642301
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/common/client_config.py1
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')
):