Skip to content

Commit

Permalink
Pass block_device_info to destroy in revert_resize
Browse files Browse the repository at this point in the history
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
(cherry picked from commit a9fc0c4)
  • Loading branch information
mrodden committed Oct 10, 2012
1 parent 9e20735 commit db516a2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion nova/compute/manager.py
Expand Up @@ -1429,7 +1429,11 @@ def revert_resize(self, context, instance, migration_id,
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)
Expand Down

0 comments on commit db516a2

Please sign in to comment.