From dee8bc62d641f633342cfdc37a246916a40b2f33 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Mon, 22 Sep 2014 12:48:20 -0500 Subject: [PATCH] Fix auth_token for old oslo.config When running with a havana-level of oslo.config (<1.3.0), applications with any config options in their api-paste.ini will fail to start with an error like 'StrOpt' object has no attribute 'type' This is because the config options didn't have a type attribute until 1.3.0. During the grenade test, the havana level of oslo.config is used, while the master level of keystoneclient is used, and also in the havana tests the services are still using the keystoneclient auth_token middleware. Change-Id: I745c3e04f18941a2d41e191d43f61b926522bb9d Closes-Bug: #1372422 --- keystoneclient/middleware/auth_token.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 48bfc5cdd..64a4a98e0 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -428,7 +428,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: