diff options
Diffstat (limited to 'nova/virt/xenapi/driver.py')
| -rwxr-xr-x | nova/virt/xenapi/driver.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 074b43f22..02b849a99 100755 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -372,7 +372,7 @@ class XenAPIDriver(driver.ComputeDriver): mountpoint) def detach_volume(self, connection_info, instance, mountpoint): - """Detach volume storage to VM instance.""" + """Detach volume storage from VM instance.""" return self._volumeops.detach_volume(connection_info, instance['name'], mountpoint) @@ -504,7 +504,10 @@ class XenAPIDriver(driver.ComputeDriver): at compute manager. """ # TODO(JohnGarbutt) look again when boot-from-volume hits trunk - pass + pre_live_migration_result = {} + pre_live_migration_result['sr_uuid_map'] = \ + self._vmops.attach_block_device_volumes(block_device_info) + return pre_live_migration_result def post_live_migration_at_destination(self, ctxt, instance_ref, network_info, block_migration, |