Merge "Fix auth_token for old oslo.config"

This commit is contained in:
Jenkins 2014-09-24 16:30:41 +00:00 committed by Gerrit Code Review
commit f56e5fef3a

View File

@ -474,7 +474,7 @@ def _conf_values_type_convert(conf):
if not conf: if not conf:
return {} return {}
opts = {} opts = {}
opt_types = dict((o.dest, o.type) for o in _OPTS) opt_types = dict((o.dest, getattr(o, 'type', str)) for o in _OPTS)
for k, v in six.iteritems(conf): for k, v in six.iteritems(conf):
try: try:
if v is None: if v is None: