From 448a578feb6edab148ef97328e57aeb06eb7360b Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Sun, 14 Oct 2012 17:55:35 +0300 Subject: [PATCH] Fixes live_migration missing migrate_data parameter in Hyper-V driver Fixes Bug #1066513 Live migration on Hyper-V fails due to the parameter "migrate_data" that has been added to the signature of live_migration(...) in nova.virt.ComputeDriver. This fix adds the new parameter. Change-Id: I393f6706bc144838ae232dfb275460620bc203e2 --- nova/virt/hyperv/driver.py | 4 ++-- nova/virt/hyperv/livemigrationops.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index 539794e48a7..1026ced95f3 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -161,9 +161,9 @@ def power_on(self, instance): self._vmops.power_on(instance) def live_migration(self, context, instance_ref, dest, post_method, - recover_method, block_migration=False): + recover_method, block_migration=False, migrate_data=None): self._livemigrationops.live_migration(context, instance_ref, dest, - post_method, recover_method, block_migration) + post_method, recover_method, block_migration, migrate_data) def compare_cpu(self, cpu_info): return self._livemigrationops.compare_cpu(cpu_info) diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py index 1f97adf248e..16baf4059f9 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -64,7 +64,7 @@ def _check_live_migration_config(self): _('Live migration networks are not configured on this host')) def live_migration(self, context, instance_ref, dest, post_method, - recover_method, block_migration=False): + recover_method, block_migration=False, migrate_data=None): LOG.debug(_("live_migration called"), instance=instance_ref) instance_name = instance_ref["name"]