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 750e94914a58b013d3219214575b14ea5200743f..2d8c7a0b5d6d470697f90853d3016f0283a69c41 100644 (file)
--- 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)