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
This commit is contained in:
Monty Taylor 2015-09-22 11:29:46 -05:00
parent 70d7da8de5
commit b399898b57
1 changed files with 3 additions and 1 deletions

View File

@ -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):