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 77eb1b7fc260fd2c84b598f304e89de24b161aa7..70e89875d88b8e90e1a7003c58bf51519a36580b 100644 (file)
--- 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 f41f2a160585893dac3dba17f6d58867183ef424..df265526cda46caae4cc94a8db4bf99ed3a547da 100644 (file)
--- 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 cabda2b3663a392fd65a400eef563d2e9cb217de..d5a1e83e6410bc2bf874a50c9469c4b930eaa6d5 100644 (file)
--- 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: