diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-15 07:12:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-15 07:12:12 +0000 |
| commit | cde48d4ad1c50a033b984b151dccf8f9f6cf4f66 (patch) | |
| tree | 0088e3a4a21420660bcca3b3fac1f7df5bd6ed7c | |
| parent | f91b69a78d16a7ddda5f8ecf7e818bbb35001c55 (diff) | |
| parent | 448a578feb6edab148ef97328e57aeb06eb7360b (diff) | |
| download | nova-cde48d4ad1c50a033b984b151dccf8f9f6cf4f66.tar.gz nova-cde48d4ad1c50a033b984b151dccf8f9f6cf4f66.tar.xz nova-cde48d4ad1c50a033b984b151dccf8f9f6cf4f66.zip | |
Merge "Fixes live_migration missing migrate_data parameter in Hyper-V driver"
| -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"] |