diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-04 22:12:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-04 22:12:20 +0000 |
| commit | e183b93481de61d909abb9569841bd553e1ea489 (patch) | |
| tree | 154b46f36a9bac87fbf9b2a71d499b32538947fb /keystone/identity | |
| parent | 0c9538d24462f64bdff64a6d80492b29a6232189 (diff) | |
| parent | 2ff3ddd356d599677bfc2a1ad08009b2226357eb (diff) | |
| download | keystone-e183b93481de61d909abb9569841bd553e1ea489.tar.gz keystone-e183b93481de61d909abb9569841bd553e1ea489.tar.xz keystone-e183b93481de61d909abb9569841bd553e1ea489.zip | |
Merge "Ignore conflict on v2 auto role assignment (bug 1161963)"
Diffstat (limited to 'keystone/identity')
| -rw-r--r-- | keystone/identity/controllers.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py index b2dae337..1afdfd26 100644 --- a/keystone/identity/controllers.py +++ b/keystone/identity/controllers.py @@ -242,10 +242,15 @@ class User(controller.V2Controller): def update_user_project(self, context, user_id, user): """Update the default tenant.""" self.assert_admin(context) - # ensure that we're a member of that tenant - default_tenant_id = user.get('tenantId') - self.identity_api.add_user_to_project(context, - default_tenant_id, user_id) + + try: + # ensure that we're a member of that tenant + self.identity_api.add_user_to_project( + context, user.get('tenantId'), user_id) + except exception.Conflict: + # we're already a member of that tenant + pass + return self.update_user(context, user_id, user) |