openstack
/
heat
Code Issues Proposed changes

Merge "Tolerate 404 on user delete."

This commit is contained in:
Jenkins 2013-07-05 03:24:10 +00:00 committed by Gerrit Code Review
parent cfb4a605fe 6c8fdd0723
commit ba649cbd34
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/user.py
View File

@ -85,7 +85,10 @@ class User(resource.Resource):
if self.resource_id is None:
logger.error("Cannot delete User resource before user created!")
return
self.keystone().delete_stack_user(self.resource_id)
try:
self.keystone().delete_stack_user(self.resource_id)
except clients.hkc.kc.exceptions.NotFound:
pass
def FnGetRefId(self):
return unicode(self.physical_resource_name())