diff options
| author | lifeless <robertc@robertcollins.net> | 2015-08-13 07:09:22 +0000 |
|---|---|---|
| committer | lifeless <robertc@robertcollins.net> | 2015-08-13 07:09:22 +0000 |
| commit | 0e3117cb01d201f403be72cbb1218b9eec69a541 (patch) | |
| tree | 48dd1606b9620e62292c7bde2d2d6ec0ed662706 | |
| parent | dfef01a7cbb9d68ad443d182e548ec58143a3a1f (diff) | |
| download | os-client-config-0e3117cb01d201f403be72cbb1218b9eec69a541.tar.gz | |
Revert "Use the correct auth_plugin for token authentication"
This reverts commit dfef01a7cbb9d68ad443d182e548ec58143a3a1f.
This broke the world.
Change-Id: I65d820b0da807a161eae814ea4b5413f245d7bf0
| -rw-r--r-- | os_client_config/config.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 240220a..1840d18 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -379,12 +379,8 @@ class OpenStackConfig(object): def _validate_auth(self, config): # May throw a keystoneclient.exceptions.NoMatchingPlugin - 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() + plugin_options = ksc_auth.get_plugin_class( + config['auth_type']).get_options() for p_opt in plugin_options: # if it's in config.auth, win, kill it from config dict |