Browse Source

Merge "Ignore Not Found when deleting Keystone role assignment"

tags/13.0.0.0rc1
Zuul 6 months ago
parent
commit
c4076e12c8
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      heat/engine/resources/openstack/keystone/role_assignments.py

+ 4
- 2
heat/engine/resources/openstack/keystone/role_assignments.py View File

@@ -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()

Loading…
Cancel
Save