summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-12 01:42:49 +0000
committerGerrit Code Review <review@openstack.org>2013-03-12 01:42:49 +0000
commit557cb9411ae0465fceacc0fd3d8ff985a0451837 (patch)
treec864023e5a574b611656861f045273949e70efb2
parent92fce3613b78c9d3bc5d78a895425cdd86d4c208 (diff)
parentca76e8638c75b3274f8eee6842fe63dff61abb5e (diff)
Merge "remove spurious roles check"
-rw-r--r--keystone/identity/controllers.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py
index 8a2e8dbe..c90f4955 100644
--- a/keystone/identity/controllers.py
+++ b/keystone/identity/controllers.py
@@ -339,8 +339,6 @@ class Role(controller.V2Controller):
# a user also adds them to a tenant, so we must follow up on that
self.identity_api.remove_role_from_user_and_project(
context, user_id, tenant_id, role_id)
- roles = self.identity_api.get_roles_for_user_and_project(
- context, user_id, tenant_id)
delete_tokens_for_user(
context, self.token_api, self.trust_api, user_id)