openstack/heat
Code Issues Proposed changes

Merge "Simplify update_with_template() method"

Browse Source
This commit is contained in:
Jenkins
2013-12-19 18:24:33 +00:00
committed by Gerrit Code Review
parent 94cf1a404b 0b0fb9594d
commit 8a08db720d
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
heat/engine/stack_resource.py
View File

@@ -128,13 +128,15 @@ class StackResource(resource.Resource):
# all subclasses want that behavior, since they may offer custom
# attributes.
nested_stack = self.nested()
if nested_stack is not None:
res_diff = (
len(template[tmpl.RESOURCES]) - len(nested_stack.resources))
new_size = nested_stack.root_stack.total_resources() + res_diff
if new_size > cfg.CONF.max_resources_per_stack:
raise exception.RequestLimitExceeded(
message=exception.StackResourceLimitExceeded.msg_fmt)
if nested_stack is None:
raise exception.Error(_('Cannot update %s, stack not created')
% self.name)
res_diff = (
len(template[tmpl.RESOURCES]) - len(nested_stack.resources))
new_size = nested_stack.root_stack.total_resources() + res_diff
if new_size > cfg.CONF.max_resources_per_stack:
raise exception.RequestLimitExceeded(
message=exception.StackResourceLimitExceeded.msg_fmt)
# Note we disable rollback for nested stacks, since they
# should be rolled back by the parent stack on failure
@@ -148,11 +150,6 @@ class StackResource(resource.Resource):
owner_id=self.stack.id)
stack.validate()
nested_stack = self.nested()
if nested_stack is None:
raise exception.Error(_('Cannot update %s, stack not created')
% self.name)
if not hasattr(type(self), 'attributes_schema'):
self.attributes = None
self._outputs_to_attribs(child_template)