Resolving functional conflicts from merge

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 8fa6c630af4139401f0fdb2df4e70081c3921f38..df9d5eeea67ea4b966202f0ea1b6ec4be8aa8cc9 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -96,8 +96,7 @@ class EngineManager(manager.Manager):
         s['raw_template_id'] = new_rt.id
         new_s = db_api.stack_create(None, s)
         stack.id = new_s.id
-        stack.start()
-       
+        stack.create() 
         return {'stack': {'id': new_s.id, 'name': new_s.name,\
                 'created_at': str(new_s.created_at)}}
 
@@ -122,10 +121,8 @@ class EngineManager(manager.Manager):
 
         rt = db_api.raw_template_get(None, st.raw_template_id)
         ps = parser.Stack(st.name, rt.template, params)
-        resources = db_api.resource_get_all_by_stack(None, st.id)
-        for r in ps.resources:
-            ps.resources[r].stop()
         db_api.stack_delete(None, stack_name)
+        ps.delete()
         return None 
         
     def list_events(self, context, stack_name):

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index edacd143363fc60d02841ba8c56ec4913394a0bb..4f1848eb95d7a8434d4dd53294b475ff6efd3128 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -16,7 +16,6 @@
 import eventlet
 import json
 import logging
-
 from heat.engine import resources
 from heat.db import api as db_api
 
@@ -160,14 +159,12 @@ class Stack(object):
         '''
         order = self.get_create_order()
         order.reverse()
-        
         for r in order:
             try:
                 self.resources[r].delete()
                 db_api.resource_get(None, self.resources[r].id).delete()
             except Exception as ex:
                 logger.error('delete: %s' % str(ex))
-                self.resources[r].state_set(self.resources[r].DELETE_FAILED, str(ex))
 
     def delete(self):
         pool = eventlet.GreenPool()

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index f182eaa7010d39f6015ee6d3896c9ede107fcac7..f84734b0bbd6a171cb62a8f562bd40cfe23a9740 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -424,7 +424,7 @@ class Instance(Resource):
             self.state_set(self.CREATE_FAILED)
 
     def delete(self):
-        Resource.stop(self)
+        Resource.delete(self)
         server = self.nova().servers.get(self.instance_id)
         server.delete()
         self.instance_id = None