openstack/heat
Code Issues Proposed changes

Merge "Ignore Not Found when deleting Keystone role assignment"

Browse Source
This commit is contained in:
Zuul
2019-05-28 15:21:16 +00:00
committed by Gerrit Code Review
parent 6323b173e8 8c67437378
commit c4076e12c8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/openstack/keystone/role_assignments.py
View File

@@ -397,6 +397,7 @@ class KeystoneUserRoleAssignment(resource.Resource,
self.update_assignment(user_id=self.user_id, prop_diff=prop_diff) self.update_assignment(user_id=self.user_id, prop_diff=prop_diff)
def handle_delete(self): def handle_delete(self):
with self.client_plugin().ignore_not_found:
self.delete_assignment(user_id=self.user_id) self.delete_assignment(user_id=self.user_id)
def validate(self): def validate(self):
@@ -455,6 +456,7 @@ class KeystoneGroupRoleAssignment(resource.Resource,
self.update_assignment(group_id=self.group_id, prop_diff=prop_diff) self.update_assignment(group_id=self.group_id, prop_diff=prop_diff)
def handle_delete(self): def handle_delete(self):
with self.client_plugin().ignore_not_found:
self.delete_assignment(group_id=self.group_id) self.delete_assignment(group_id=self.group_id)
def validate(self): def validate(self):