From 4d1b1394cfc319efc52f896d78c92314ea4b3406 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Fri, 13 Apr 2012 20:13:09 +1000 Subject: [PATCH] move the db stack delete into parser.py as it is non-blocking. Signed-off-by: Angus Salkeld --- heat/engine/manager.py | 1 - heat/engine/parser.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 7d46f3d2..f50315af 100644 --- 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 0fbcd0ba..ce23e007 100644 --- 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) -- 2.45.2