summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-07 03:52:31 +0000
committerGerrit Code Review <review@openstack.org>2020-03-07 03:52:31 +0000
commit82f63c992f5382e412acd7929dee31f1c4fa9943 (patch)
tree6b6e274587e028933ca4a5a1e22cd16de9204860
parent8c51a09f425387edcbaec9464cff84ff9a19d081 (diff)
parenta4d401d7827ffdbd2bdd8243eae6bfd6d5ddeb53 (diff)
downloadheat-82f63c992f5382e412acd7929dee31f1c4fa9943.tar.gz
Merge "Ignore Not Found when deleting Keystone role assignment" into stable/rockyrocky-em11.0.3
-rw-r--r--heat/engine/resources/openstack/keystone/role_assignments.py6
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()