upstream/oracle/userland-gate: changeset 5484:1310f15efa0d

author	Sean Wilcox <sean.wilcox@oracle.com>
	Tue, 23 Feb 2016 14:20:05 -0800
branch	s11u3-sru
changeset 5484	1310f15efa0d
parent 5483	c705419970e3
child 5487	386db44fba42

22691630 attempting to resize or evacuate with a network is broken

--- a/components/openstack/nova/files/solariszones/driver.py	Tue Feb 23 09:35:42 2016 -0800
+++ b/components/openstack/nova/files/solariszones/driver.py	Tue Feb 23 14:20:05 2016 -0800
@@ -1338,7 +1338,9 @@
             if tstate not in [task_states.RESIZE_FINISH,
                               task_states.RESIZE_REVERTING,
                               task_states.RESIZE_MIGRATING,
-                              task_states.REBUILD_SPAWNING]:
+                              task_states.REBUILD_SPAWNING] or \
+                (tstate == task_states.REBUILD_SPAWNING and
+                 instance.system_metadata['rebuilding']):
                 subnet_uuid = port['fixed_ips'][0]['subnet_id']
                 subnet = network_plugin.show_subnet(subnet_uuid)['subnet']