openstack
/
heat
Code Issues Proposed changes

Merge "Ignore Not Found when deleting Keystone role assignment" into stable/queens

This commit is contained in:
Zuul 2020-03-09 14:57:15 +00:00 committed by Gerrit Code Review
parent 5352760deb e3aa075b95
commit ee088cf4c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,7 +395,8 @@ 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):
self.delete_assignment(user_id=self.user_id) with self.client_plugin().ignore_not_found:
self.delete_assignment(user_id=self.user_id)
def validate(self): def validate(self):
super(KeystoneUserRoleAssignment, self).validate() super(KeystoneUserRoleAssignment, self).validate()
@ -453,7 +454,8 @@ 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):
self.delete_assignment(group_id=self.group_id) with self.client_plugin().ignore_not_found:
self.delete_assignment(group_id=self.group_id)
def validate(self): def validate(self):
super(KeystoneGroupRoleAssignment, self).validate() super(KeystoneGroupRoleAssignment, self).validate()