summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Guerri <davide.guerri@gmail.com>2015-08-11 23:54:39 +0100
committerDavide Guerri <davide.guerri@gmail.com>2015-08-11 23:55:22 +0100
commitdfef01a7cbb9d68ad443d182e548ec58143a3a1f (patch)
tree6ca853e85a12ea5aa48bfc0f1dc08b40a4d76788
parenta8e8c809eeec0f09b5d9207c29efb3c6a1f9c088 (diff)
downloados-client-config-dfef01a7cbb9d68ad443d182e548ec58143a3a1f.tar.gz
Use the correct auth_plugin for token authentication
Use ksc_auth.token_endpoint.Token as Keystone authentication plugin if auth_type is token_endpoint. Change-Id: I1a6d6dfe731527d7040cfbc2404fd5cf86ba5893
-rw-r--r--os_client_config/config.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index 1840d18..240220a 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -379,8 +379,12 @@ class OpenStackConfig(object):
def _validate_auth(self, config):
# May throw a keystoneclient.exceptions.NoMatchingPlugin
- plugin_options = ksc_auth.get_plugin_class(
- config['auth_type']).get_options()
+ if config['auth_type'] == 'token_endpoint':
+ auth_plugin = ksc_auth.token_endpoint.Token
+ else:
+ auth_plugin = ksc_auth.get_plugin_class(config['auth_type'])
+
+ plugin_options = auth_plugin.get_options()
for p_opt in plugin_options:
# if it's in config.auth, win, kill it from config dict