diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-27 21:23:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-27 21:23:06 +0000 |
| commit | 24b1785042521e5b07f5be1f5e8753d4725481ea (patch) | |
| tree | 60f4bf5fb5bc06113fd9a9e3db6a15adb5091819 | |
| parent | 0d565de78b5cc8ecdd18e10444ec731db46b48eb (diff) | |
| parent | a9fc0c43873ef7dfe3c2ee0e57b219ddd6746df3 (diff) | |
Merge "Pass block_device_info to destroy in revert_resize"
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 5 insertions, 1 deletions
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) |