summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-11 00:19:22 +0000
committerGerrit Code Review <review@openstack.org>2013-07-11 00:19:22 +0000
commit9a5b0c3a95c13d44013f3581821e1f06800cf986 (patch)
treef89141d743a53d60fdb70046c2b4dc4f70e9035b
parent69451bf2455a8fc1e3603804c7608aeacee874a0 (diff)
parentf58f6ea3987015c10c3331ead5025527d4b90ab9 (diff)
downloadkeystone-9a5b0c3a95c13d44013f3581821e1f06800cf986.tar.gz
keystone-9a5b0c3a95c13d44013f3581821e1f06800cf986.tar.xz
keystone-9a5b0c3a95c13d44013f3581821e1f06800cf986.zip
Merge "Remove context from get_token call in normalize_domain_id"
-rw-r--r--keystone/common/controller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/common/controller.py b/keystone/common/controller.py
index f19f13ec..0ad1efa3 100644
--- a/keystone/common/controller.py
+++ b/keystone/common/controller.py
@@ -313,7 +313,7 @@ class V3Controller(V2Controller):
# worth the duplication of state
try:
token_ref = self.token_api.get_token(
- context=context, token_id=context['token_id'])
+ token_id=context['token_id'])
except exception.TokenNotFound:
LOG.warning(_('Invalid token in normalize_domain_id'))
raise exception.Unauthorized()