diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-09 14:57:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-09 14:57:15 +0000 |
| commit | ee088cf4c06cea091fbc75699354d8ccdb386209 (patch) | |
| tree | 2bce2b1f0ba9018b6f85648275d0a04e1efb4b68 | |
| parent | 5352760deb3da75c59615e4850d391bdb51167ee (diff) | |
| parent | e3aa075b9578be12faeeb157b61557fdd51eee7f (diff) | |
| download | heat-ee088cf4c06cea091fbc75699354d8ccdb386209.tar.gz | |
Merge "Ignore Not Found when deleting Keystone role assignment" into stable/queens
| -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 b47a1f010..f84ea6ba4 100644 --- a/heat/engine/resources/openstack/keystone/role_assignments.py +++ b/heat/engine/resources/openstack/keystone/role_assignments.py @@ -395,7 +395,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() @@ -453,7 +454,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() |