diff options
| author | Alessandro Pilotti <ap@pilotti.it> | 2012-10-14 17:55:35 +0300 |
|---|---|---|
| committer | Alessandro Pilotti <ap@pilotti.it> | 2012-10-14 18:46:37 +0300 |
| commit | 448a578feb6edab148ef97328e57aeb06eb7360b (patch) | |
| tree | d25673501fdb1b13a5700d3c55e34b840582d00f | |
| parent | faa47fef92a2ea5440202d20f7965fb365791647 (diff) | |
| download | nova-448a578feb6edab148ef97328e57aeb06eb7360b.tar.gz nova-448a578feb6edab148ef97328e57aeb06eb7360b.tar.xz nova-448a578feb6edab148ef97328e57aeb06eb7360b.zip | |
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
| -rw-r--r-- | nova/virt/hyperv/driver.py | 4 | ||||
| -rw-r--r-- | 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 539794e48..1026ced95 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -161,9 +161,9 @@ class HyperVDriver(driver.ComputeDriver): 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 1f97adf24..16baf4059 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -64,7 +64,7 @@ class LiveMigrationOps(baseops.BaseOps): _('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"] |