Updating legacy auth translation to 2.0 (bug #863661)

Change-Id: I3a31beec9a5bd0ced70c2e93e7dbdaba072b1f0c

1 files changed, 2 insertions, 2 deletions

diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index 1f93b71a..30eb0b63 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}