diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-13 07:31:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-13 07:31:31 +0000 |
| commit | c422fe89ab6e13dcb10fdc26a6b5369b22901af7 (patch) | |
| tree | 8360ff5b9c5ec85c1a36d3dee1a077603f09db63 | |
| parent | a2be4a78c89e66758aea9280e14e0455daa3de82 (diff) | |
| parent | 0e3117cb01d201f403be72cbb1218b9eec69a541 (diff) | |
| download | os-client-config-c422fe89ab6e13dcb10fdc26a6b5369b22901af7.tar.gz | |
Merge "Revert "Use the correct auth_plugin for token authentication""1.6.3
| -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 c6ddf52..7c65b53 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -383,12 +383,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 |