diff options
| author | Zane Bitter <zbitter@redhat.com> | 2019-05-13 10:16:45 -0400 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2020-02-27 10:40:31 +0000 |
| commit | 1c6dee1f90851aad55ff9b77cc1b724e43b96e16 (patch) | |
| tree | a304a55e2e37b6da0e35c578e95c4f287ca468b8 | |
| parent | e4134dae74ded2683ec6eead39bf47d4838378af (diff) | |
| download | heat-1c6dee1f90851aad55ff9b77cc1b724e43b96e16.tar.gz | |
Ignore Not Found when deleting Keystone role assignment
If the project has already been deleted, don't let that prevent role
assignments on it from being deleted.
Change-Id: I56aede8209e425ee6c2d762a44db8cda5416e69b
Task: 30955
(cherry picked from commit 8c67437378ca505c5752cee0d862d806ca11c3a0)
| -rw-r--r-- | heat/engine/resources/openstack/keystone/role_assignments.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/heat/engine/resources/openstack/keystone/role_assignments.py b/heat/engine/resources/openstack/keystone/role_assignments.py index d2717c99a..e8d31050d 100644 --- a/heat/engine/resources/openstack/keystone/role_assignments.py +++ b/heat/engine/resources/openstack/keystone/role_assignments.py @@ -397,7 +397,8 @@ class KeystoneUserRoleAssignment(resource.Resource, self.update_assignment(user_id=self.user_id, prop_diff=prop_diff) 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): super(KeystoneUserRoleAssignment, self).validate() @@ -455,7 +456,8 @@ class KeystoneGroupRoleAssignment(resource.Resource, self.update_assignment(group_id=self.group_id, prop_diff=prop_diff) 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): super(KeystoneGroupRoleAssignment, self).validate() |