summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-08-01 12:45:16 +1000
committerMonty Taylor <mordred@inaugust.com>2015-08-01 12:53:45 +1000
commita8e8c809eeec0f09b5d9207c29efb3c6a1f9c088 (patch)
tree48dd1606b9620e62292c7bde2d2d6ec0ed662706
parent0567c717162f6a5643d15b526aa68d3b3eadb5ce (diff)
downloados-client-config-1.6.1.tar.gz
Align to generic password auth-type1.6.1
v2password can't handle v3 parameter names. But we align to those for sanity. Ensure that a user gets the v2plugin that can handle the auth instead of the one that can't. Change-Id: Ie693e613fd5d0e20a4837923300502b1de02364b
-rw-r--r--os_client_config/config.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index 015a783..1840d18 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -314,6 +314,12 @@ class OpenStackConfig(object):
target = cloud[key]
del cloud[key]
cloud[target_key] = target
+ # Because we force alignment to v3 nouns, we want to force
+ # use of the auth plugin that can do auto-selection and dealing
+ # with that based on auth parameters. v2password is basically
+ # completely broken
+ if cloud['auth_type'] == 'v2password':
+ cloud['auth_type'] = 'password'
return cloud
def _fix_backwards_interface(self, cloud):