summaryrefslogtreecommitdiffstats
path: root/keystone/middleware
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-29 21:17:51 +0000
committerGerrit Code Review <review@openstack.org>2012-05-29 21:17:51 +0000
commit081c541603c439a0eaa4608eec9225d0626c075d (patch)
treed665dbebd18a9c3f1b6651a0b6aa396d23b8196f /keystone/middleware
parentdd59347b6590ecceb9fbc880ea69c36b04bf3e4f (diff)
parentbc803a4cede7ed2f39f4dc5c74977eedf46eb205 (diff)
downloadkeystone-081c541603c439a0eaa4608eec9225d0626c075d.tar.gz
keystone-081c541603c439a0eaa4608eec9225d0626c075d.tar.xz
keystone-081c541603c439a0eaa4608eec9225d0626c075d.zip
Merge "Make sure we parse delay_auth_decision as boolean."
Diffstat (limited to 'keystone/middleware')
-rw-r--r--keystone/middleware/auth_token.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index c95508fb..a6f2af66 100644
--- a/keystone/middleware/auth_token.py
+++ b/keystone/middleware/auth_token.py
@@ -120,7 +120,8 @@ class AuthProtocol(object):
# delay_auth_decision means we still allow unauthenticated requests
# through and we let the downstream service make the final decision
- self.delay_auth_decision = int(conf.get('delay_auth_decision', 0))
+ self.delay_auth_decision = (conf.get('delay_auth_decision', False)
+ in ('true', 't', '1', 'on', 'yes', 'y'))
# where to find the auth service (we use this to validate tokens)
self.auth_host = conf.get('auth_host')