diff options
Diffstat (limited to 'heat/engine/stack.py')
| -rw-r--r-- | heat/engine/stack.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/heat/engine/stack.py b/heat/engine/stack.py index b8a074a02..8c6085b08 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -1456,6 +1456,7 @@ class Stack(collections.Mapping): updater = scheduler.TaskRunner(update_task) self.parameters = newstack.parameters + self.t._conditions = newstack.t.conditions(newstack) self.t.files = newstack.t.files self.t.env = newstack.t.env self.disable_rollback = newstack.disable_rollback @@ -1519,8 +1520,10 @@ class Stack(collections.Mapping): # and new stack resources, we should have user params of both. existing_params.load(newstack.t.env.user_env_as_dict()) self.t.env = existing_params + self.t.merge_snippets(newstack.t) self.t.store(self.context) backup_stack.t.env = existing_params + backup_stack.t.merge_snippets(newstack.t) backup_stack.t.store(self.context) self.store() |