diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-13 00:39:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-13 00:39:02 +0000 |
| commit | a2be4a78c89e66758aea9280e14e0455daa3de82 (patch) | |
| tree | f1e59254ff519af05ec863612fd214c7da0c1826 | |
| parent | 13a04f76b9f13ec89a9d0aa8a7e9b064e8fa98b4 (diff) | |
| parent | dfef01a7cbb9d68ad443d182e548ec58143a3a1f (diff) | |
| download | os-client-config-a2be4a78c89e66758aea9280e14e0455daa3de82.tar.gz | |
Merge "Use the correct auth_plugin for token authentication"1.6.2
| -rw-r--r-- | os_client_config/config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 7c65b53..c6ddf52 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -383,8 +383,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 |