openstack
/
heat
Code Issues Proposed changes

Allow an already deleted watch to not fail the stack.delete(). 

Change-Id: I1fbf46475b901bb2cc3b85784444e547ab9d9e67
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-06-12 16:42:06 +10:00
parent b343c6b838
commit 6d4c5618db
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/cloud_watch.py
View File

@ -87,7 +87,10 @@ class CloudWatchAlarm(Resource):
self.state_set(self.DELETE_IN_PROGRESS)
Resource.delete(self)
db_api.watch_rule_delete(self.stack.context, self.name)
try:
db_api.watch_rule_delete(self.stack.context, self.name)
except Exception as ex:
pass
self.state_set(self.DELETE_COMPLETE)