diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 15:37:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 15:37:47 +0000 |
| commit | 3703e230a55f56e13662a36fd15517c126d10ac0 (patch) | |
| tree | 2bebf2315c4092c2dfa3cd7435d9bbf95f74bcdc | |
| parent | c422fe89ab6e13dcb10fdc26a6b5369b22901af7 (diff) | |
| parent | e29ed75a4b72ed25c7791dab8a66f3a3c86f962a (diff) | |
| download | os-client-config-3703e230a55f56e13662a36fd15517c126d10ac0.tar.gz | |
Merge "Revert "Revert "Use the correct auth_plugin for token authentication"""
| -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..1542f2f 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'] == 'admin_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 |