diff options
author | Adam Young <ayoung@redhat.com> | 2013-03-08 21:19:25 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2013-03-15 15:21:36 -0400 |
commit | eb4dd4afbffaa15be0af70a317da7034ae28dfd6 (patch) | |
tree | 89f3b2b71b34b3627fe1d7893ad51578032f5afd /keystone/auth | |
parent | a79a7c1ddb6c7e3f71cc9791b318bdefbc1abeb8 (diff) | |
download | keystone-eb4dd4afbffaa15be0af70a317da7034ae28dfd6.tar.gz keystone-eb4dd4afbffaa15be0af70a317da7034ae28dfd6.tar.xz keystone-eb4dd4afbffaa15be0af70a317da7034ae28dfd6.zip |
extracting user and trust ids into normalized fields
These fields are used for queries, and may need to be indexed
Also moves the delete token for... functions into the base class
for controllers.
Removed the token API revoke token call as that needed access to other
APIs. Logic was moved into the controller.
Bug 1152801
Change-Id: I59c360fe5aef905dfa30cb55ee54ff1fbe64dc58
Diffstat (limited to 'keystone/auth')
-rw-r--r-- | keystone/auth/token_factory.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/auth/token_factory.py b/keystone/auth/token_factory.py index 172216e9..0ec2fe28 100644 --- a/keystone/auth/token_factory.py +++ b/keystone/auth/token_factory.py @@ -285,7 +285,8 @@ def create_token(context, auth_context, auth_info): user=token_data['token']['user'], tenant=token_data['token'].get('project'), metadata=metadata_ref, - token_data=token_data) + token_data=token_data, + trust_id=trust['id'] if trust else None) token_api.create_token(context, token_id, data) except Exception as e: # an identical token may have been created already. |