From a9fc0c43873ef7dfe3c2ee0e57b219ddd6746df3 Mon Sep 17 00:00:00 2001 From: Matt Odden Date: Thu, 27 Sep 2012 17:35:54 +0000 Subject: Pass block_device_info to destroy in revert_resize Fixes bug #1056285 Passing block_device_info allows the driver to clean up block device mappings (detaching) properly on the newly resized instance Change-Id: I2527f883883c741dbf4d20be0ca33dbef6f9f36a --- nova/compute/manager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 4c8f3e1f0..e8b40731a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1435,7 +1435,11 @@ class ComputeManager(manager.SchedulerDependentManager): teardown=True) network_info = self._get_instance_nw_info(context, instance) - self.driver.destroy(instance, self._legacy_nw_info(network_info)) + block_device_info = self._get_instance_volume_block_device_info( + context, instance['uuid']) + + self.driver.destroy(instance, self._legacy_nw_info(network_info), + block_device_info) self.compute_rpcapi.finish_revert_resize(context, instance, migration_ref['id'], migration_ref['source_compute'], reservations) -- cgit