openstack/heat
Code Issues Proposed changes

Merge "Convergence: Resolve attributes during rollback"

Browse Source
This commit is contained in:
Jenkins 2015-09-07 14:22:42 +00:00 committed by Gerrit Code Review
commit 3844ed811e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/cfn/functions.py
View File

@ -196,7 +196,8 @@ class GetAtt(function.Function):
attribute = function.resolve(self._attribute)
r = self._resource()
if (r.action in (r.CREATE, r.ADOPT, r.SUSPEND, r.RESUME, r.UPDATE)):
if r.action in (r.CREATE, r.ADOPT, r.SUSPEND, r.RESUME,
r.UPDATE, r.ROLLBACK):
return r.FnGetAtt(attribute)
# NOTE(sirushtim): Add r.INIT to states above once convergence
# is the default.

4
heat/engine/stack.py
View File

@ -948,7 +948,11 @@ class Stack(collections.Mapping):
# no back-up template for create action
self.prev_raw_template_id = getattr(self.t, 'id', None)
# switch template and reset dependencies
self.t = template
self.reset_dependencies()
self._resources = None
previous_traversal = self.current_traversal
self.current_traversal = uuidutils.generate_uuid()
self.updated_time = datetime.datetime.utcnow()