diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-24 16:30:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-24 16:30:41 +0000 |
| commit | f56e5fef3a6121079f745188dc4f64f9b707477b (patch) | |
| tree | a881b762aadab12b3636713d72c10d62299be801 | |
| parent | 3aa18b2450671703127171966c0f6ecddae83736 (diff) | |
| parent | bc2613e06b7dee3a51191de900d98636181ba130 (diff) | |
| download | keystonemiddleware-f56e5fef3a6121079f745188dc4f64f9b707477b.tar.gz | |
Merge "Fix auth_token for old oslo.config"
| -rw-r--r-- | keystonemiddleware/auth_token.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py index 7a07858..07a3582 100644 --- 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: |