Add calculate_properties() to update() and restart_resource()

This is the same fix as 783b1112490ef07db05251c1258c04f8b1caa5a0

Change-Id: I17a30b0c670dee5b228b4af8dad06ad109471e5d
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 283d2afc5ec4cc43c700690124038cf6f0b45667..ec95b8e8fa13af4d48483fa1c658be0383615e10 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -457,8 +457,11 @@ class Stack(object):
         failures = []
         with eventlet.Timeout(self.timeout_mins * 60) as tmo:
             try:
-                # First delete any resources which are not in newstack
                 for res in self:
+                    res.calculate_properties()
+
+                # First delete any resources which are not in newstack
+                for res in reversed(self):
                     if not res.name in newstack.keys():
                         logger.debug("resource %s not found in updated stack"
                                       % res.name + " definition, deleting")
@@ -588,6 +591,9 @@ class Stack(object):
         deps = self.dependencies[self[resource_name]]
         failed = False
 
+        for res in self:
+            res.calculate_properties()
+
         for res in reversed(deps):
             try:
                 res.destroy()