From: Angus Salkeld <asalkeld@redhat.com>
Date: Mon, 4 Jun 2012 23:31:34 +0000 (+1000)
Subject: Fix cloudwatch delete
X-Git-Tag: 2014.1~1752
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f5c88891cb3754f68dec03dfb642a8185c6eb70d;p=openstack-build%2Fheat-build.git

Fix cloudwatch delete

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

diff --git a/heat/engine/cloud_watch.py b/heat/engine/cloud_watch.py
index b6945a7c..5262f1a0 100644
--- a/heat/engine/cloud_watch.py
+++ b/heat/engine/cloud_watch.py
@@ -86,10 +86,10 @@ class CloudWatchAlarm(Resource):
             return
 
         self.state_set(self.DELETE_IN_PROGRESS)
+        Resource.delete(self)
 
         db_api.watch_rule_delete(self.stack.context, self.name)
 
-        Resource.delete(self)
         self.state_set(self.DELETE_COMPLETE)
 
     def FnGetRefId(self):