move the db stack delete into parser.py as it is non-blocking.

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

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 7d46f3d216f5d171e132dc02e8416255e6025a11..f50315afc6b95603e667c569bbae0bd2596d1890 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -123,7 +123,6 @@ class EngineManager(manager.Manager):
 
         rt = db_api.raw_template_get(None, st.raw_template_id)
         ps = parser.Stack(st.name, rt.template, params)
-        db_api.stack_delete(None, stack_name)
         ps.delete()
         return None
 

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 0fbcd0baff19ad50408911ec6d262b3f00d8108a..ce23e007b8a837b70eb47ccda0e33ab9878f01b9 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -168,6 +168,8 @@ class Stack(object):
             except Exception as ex:
                 logger.error('delete: %s' % str(ex))
 
+        db_api.stack_delete(None, self.name)
+
     def delete(self):
         pool = eventlet.GreenPool()
         pool.spawn_n(self.delete_blocking)