Merge "Fix auth_token for old oslo.config"

2014-09-24 16:30:41 +00:00 · 2014-09-24 16:30:41 +00:00 · f56e5fef3a
commit f56e5fef3a
parent 3aa18b2450 bc2613e06b
1 changed files with 1 additions and 1 deletions
--- a/keystonemiddleware/auth_token.py
+++ b/keystonemiddleware/auth_token.py
@ -474,7 +474,7 @@ def _conf_values_type_convert(conf):
    if not conf:
        return {}
    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):
        try:
            if v is None: