openstack
/
heat
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2020-03-05 19:06:47 +00:00 committed by Gerrit Code Review
parent 7480a8f313 1c6dee1f90
commit 5d99ba41da
1 changed files with 4 additions and 2 deletions
Show Stats 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)
def handle_delete(self):
with self.client_plugin().ignore_not_found:
self.delete_assignment(user_id=self.user_id)
def validate(self):
@ -455,6 +456,7 @@ class KeystoneGroupRoleAssignment(resource.Resource,
self.update_assignment(group_id=self.group_id, prop_diff=prop_diff)
def handle_delete(self):
with self.client_plugin().ignore_not_found:
self.delete_assignment(group_id=self.group_id)
def validate(self):