From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 24 Jul 2012 09:04:07 +0000 (+1000)
Subject: Log the error when a resouce fails to delete
X-Git-Tag: 2014.1~1562
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8c3f0f14a5f2b41f0a7f4922a3100c0797feaddd;p=openstack-build%2Fheat-build.git

Log the error when a resouce fails to delete

Also bail out of handle_delete if instance_id is None

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

diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 77eb1b7f..70e89875 100644
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -287,6 +287,8 @@ class Instance(resources.Resource):
         '''
         Delete an instance, blocking until it is disposed by OpenStack
         '''
+        if self.instance_id is None:
+            return
         try:
             server = self.nova().servers.get(self.instance_id)
         except NotFound:
diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index f41f2a16..df265526 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -559,6 +559,8 @@ class Stack(object):
         for res in reversed(self):
             result = res.destroy()
             if result:
+                logger.error('Failed to delete %s error: %s' % (str(res),
+                                                                result))
                 failures.append(str(res))
 
         if failures:
diff --git a/heat/engine/user.py b/heat/engine/user.py
index cabda2b3..d5a1e83e 100644
--- a/heat/engine/user.py
+++ b/heat/engine/user.py
@@ -60,6 +60,8 @@ class User(Resource):
         return self.UPDATE_REPLACE
 
     def handle_delete(self):
+        if self.instance_id is None:
+            return
         try:
             user = self.keystone().users.get(DummyId(self.instance_id))
         except Exception as ex: