openstack
/
heat
Code Issues Proposed changes

Fix stack creation - CREATE_FAILED issue 

The stack creation call to validate the stack was resetting the
stack template attribute.  I've made a copy of the stack purely
for validation purposes.
This commit is contained in:
Chris Alfonso 2012-05-09 09:45:15 -04:00
parent 1b903f8b70
commit dd3d21ee9e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/manager.py
View File

@ -126,7 +126,11 @@ class EngineManager(manager.Manager):
metadata_server = config.FLAGS.heat_metadata_server_url
stack = parser.Stack(stack_name, template, 0, params,
metadata_server=metadata_server)
response = stack.validate()
# We don't want to reset the stack template, so we are making
# an instance just for validation.
stack_validator = parser.Stack(stack_name, template, 0, params,
metadata_server=metadata_server)
response = stack_validator.validate()
if 'Malformed Query Response' in response['ValidateTemplateResult']['Description']:
return response['ValidateTemplateResult']['Description']
rt = {}

3
heat/tests/test_resources.py
View File

@ -64,7 +64,6 @@ class instancesTest(unittest.TestCase):
# need to resolve the template functions
server_userdata = instance._build_userdata(\
instance.t['Properties']['UserData'])
self.m.StubOutWithMock(self.fc.servers, 'create')
self.fc.servers.create(image=1, flavor=1, key_name='test',\
name='test_resource_name', security_groups=None,\
@ -115,7 +114,6 @@ class instancesTest(unittest.TestCase):
# need to resolve the template functions
server_userdata = instance._build_userdata(\
instance.t['Properties']['UserData'])
self.m.StubOutWithMock(self.fc.servers, 'create')
self.fc.servers.create(image=1, flavor=1, key_name='test',\
name='test_resource_name', security_groups=None,\
@ -128,7 +126,6 @@ class instancesTest(unittest.TestCase):
instance.create()
# this makes sure the auto increment worked on instance creation
assert(instance.id > 0)
instance.delete()