diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-26 00:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-26 00:53:31 +0000 |
| commit | a42ebf01f6c321a851ddea337bc7365abff2f1d2 (patch) | |
| tree | 2d2230a04841a361afbd5a360bd63964b0647440 /nova/compute | |
| parent | b0e8189246b66a6943f6abfc17a61efe04dfb39b (diff) | |
| parent | 99b5e96795b8475f14d53bbc3845e7bace730963 (diff) | |
| download | nova-a42ebf01f6c321a851ddea337bc7365abff2f1d2.tar.gz nova-a42ebf01f6c321a851ddea337bc7365abff2f1d2.tar.xz nova-a42ebf01f6c321a851ddea337bc7365abff2f1d2.zip | |
Merge "Allow VMs to be resumed after a hypervisor reboot"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 724760350..2b621d5f6 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2159,7 +2159,13 @@ class ComputeManager(manager.SchedulerDependentManager): """Resume the given suspended instance.""" context = context.elevated() LOG.audit(_('Resuming'), context=context, instance=instance) - self.driver.resume(instance) + + network_info = self._get_instance_nw_info(context, instance) + block_device_info = self._get_instance_volume_block_device_info( + context, instance['uuid']) + + self.driver.resume(instance, self._legacy_nw_info(network_info), + block_device_info) current_power_state = self._get_power_state(context, instance) self._instance_update(context, |