Parallelise Instance updates

Change-Id: I358f7fbdb3232f4bf528d170476935ef2b4239cc

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index f2796a6f4566d5265f87cf11cb56b402bbcc130c..d8509c9b682cf22b379bd9b577a7d424a6bd1203 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -345,7 +345,13 @@ class Instance(resource.Resource):
             flavor_id = nova_utils.get_flavor_id(self.nova(), flavor)
             server = self.nova().servers.get(self.resource_id)
             server.resize(flavor_id)
-            scheduler.TaskRunner(nova_utils.check_resize, server, flavor)()
+            checker = scheduler.TaskRunner(nova_utils.check_resize,
+                                           server, flavor)
+            checker.start()
+            return checker
+
+    def check_update_complete(self, checker):
+        return checker.step() if checker is not None else True
 
     def metadata_update(self, new_metadata=None):
         '''

diff --git a/heat/engine/resources/rackspace/cloud_server.py b/heat/engine/resources/rackspace/cloud_server.py
index 16584919a002225f090c1c41dd74e8b69632e563..d46e4eb72a0d6f1a5a7d36e6b889af888f9534d3 100644 (file)
--- a/heat/engine/resources/rackspace/cloud_server.py
+++ b/heat/engine/resources/rackspace/cloud_server.py
@@ -431,8 +431,6 @@ zypper --non-interactive in cloud-init python-boto python-pip gcc python-devel
         elif 'name' in prop_diff:
             logger.info("Cloud Server rename not supported.")
 
-        return True
-
     def _resolve_attribute(self, key):
         """Return the method that provides a given template attribute."""
         attribute_function = {'PublicIp': self.public_ip,