summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xkeystone/middleware/auth_token.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index 1f93b71a3..30eb0b639 100755
--- a/keystone/middleware/auth_token.py
+++ b/keystone/middleware/auth_token.py
@@ -287,11 +287,11 @@ class AuthProtocol(object):
roles.append(role_ref["name"])
try:
- tenant = token_info['access']['token']['tenantId']
+ tenant = token_info['access']['token']['tenant']['id']
except:
tenant = None
if not tenant:
- tenant = token_info['access']['user']['tenantId']
+ tenant = token_info['access']['user'].get('tenantId')
verified_claims = {'user': token_info['access']['user']['username'],
'tenant': tenant,
'roles': roles}