Resolving functional conflicts from merge
This commit is contained in:
parent
0dc8d604ab
commit
1185476275
|
@ -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):
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue