diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-22 16:49:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-22 16:49:48 +0000 |
| commit | 512d00e208190cd3d38ff275567633ff1dcdcf20 (patch) | |
| tree | 137bea2366b5bd958e1c70d644d170fa470f4dfd | |
| parent | 7f33416020801dfc8a444a80705ef2f491a4d066 (diff) | |
| parent | 0f089647b89817c5347e1f01335fd6aa6f9d313b (diff) | |
| download | os-client-config-1.7.5.tar.gz | |
Merge "Fix a little error with the None auth type"1.7.5
| -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): |