diff options
| author | Monty Taylor <mordred@inaugust.com> | 2015-09-22 11:29:46 -0500 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2015-09-22 11:32:44 -0500 |
| commit | 0f089647b89817c5347e1f01335fd6aa6f9d313b (patch) | |
| tree | 39746c0bc9b067dda6fbd8b1aced9b2dbb20a7e5 /os_client_config | |
| parent | 8dee656df809ed1b39b2800e35cc5ef67c31e84e (diff) | |
| download | os-client-config-0f089647b89817c5347e1f01335fd6aa6f9d313b.tar.gz | |
Fix a little error with the None auth type
Ironic has a mode where it does not use auth, but we still funnel that
through the ksa admin_token type for consistency of code. The hack we
had to do that went too far and caused validate_auth to strip the fake
token we were adding.
Change-Id: Id5275ac7db1a6052db02c2286cbf88862cb1ff70
Diffstat (limited to 'os_client_config')
| -rw-r--r-- | os_client_config/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 1b6193e..fcca30a 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -419,7 +419,9 @@ class OpenStackConfig(object): # _other_ things (SSL arg handling, timeout) all work consistently if config['auth_type'] in (None, "None", ''): config['auth_type'] = 'admin_token' - config['auth']['token'] = None + # Set to notused rather than None because validate_auth will + # strip the value if it's actually python None + config['auth']['token'] = 'notused' return loading.get_plugin_loader(config['auth_type']) def _validate_auth_ksc(self, config): |