From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 12 Jun 2012 06:42:06 +0000 (+1000)
Subject: Allow an already deleted watch to not fail the stack.delete().
X-Git-Tag: 2014.1~1733
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6d4c5618db43725c0af2b37661911a960bfa0aa2;p=openstack-build%2Fheat-build.git

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

Change-Id: I1fbf46475b901bb2cc3b85784444e547ab9d9e67
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
---

diff --git a/heat/engine/cloud_watch.py b/heat/engine/cloud_watch.py
index 750e9491..2d8c7a0b 100644
--- a/heat/engine/cloud_watch.py
+++ b/heat/engine/cloud_watch.py
@@ -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)