← Back to branch summary

~ubuntu-branches/ubuntu/raring/keystone/raring-updates

« back to all changes in this revision

Viewing changes to keystone/common/controller.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-10-17 13:52:59 UTC
  • mfrom: (1.1.37)
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131017135259-dqiwbrzjs1q4mp6q
Tags: 1:2013.1.4-0ubuntu1
https://launchpad.net/bugs/1241202
* Resynchronize with stable/grizzly (9666fc0) (LP: #1241202):
  - [6792499] periodic-keystone-python27-stable-grizzly fails due to"No
    module named netaddr"   LP: 1212939
  - [775d7a7] Fix and test token revocation list API
  - [0876ea2] N+1 lookups in groups SQL LP: 1218675
  - [afbc75b] Disabling a tenant would not disable a user token LP: 1179955
  - [9666fc0] User operations with LDAP Identity and
    enabled_mask/user_enabled_default fail LP: 1210175

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/common/controller.py
171
171
                                          trust['trustee_user_id'],
172
172
                                          trust['id'])
173
173
 
 
174
    def _delete_tokens_for_project(self, context, project_id):
 
175
        for user_ref in self.identity_api.get_project_users(
 
176
                context, project_id):
 
177
            self._delete_tokens_for_user(
 
178
                context, user_ref['id'], project_id=project_id)
 
179
 
174
180
    def _require_attribute(self, ref, attr):
175
181
        """Ensures the reference contains the specified attribute."""
176
182
        if ref.get(attr) is None or ref.get(attr) == '':