]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Fix cloudwatch delete
authorAngus Salkeld <asalkeld@redhat.com>
Mon, 4 Jun 2012 23:31:34 +0000 (09:31 +1000)
committerAngus Salkeld <asalkeld@redhat.com>
Tue, 5 Jun 2012 01:24:38 +0000 (11:24 +1000)
Change-Id: I091bb394f5ad3afad82d55f4a81bdce94cc09b71
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
heat/engine/cloud_watch.py

index b6945a7c7a6a5b11278482bfe9adf5c883a89ecd..5262f1a0e3746ac59fd3756e09af8d11a6c7d4f4 100644 (file)
@@ -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):