Skip to content

Commit

Permalink
Fixes live_migration missing migrate_data parameter in Hyper-V driver
Browse files Browse the repository at this point in the history
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
  • Loading branch information
alexpilotti committed Oct 14, 2012
1 parent faa47fe commit 448a578
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions nova/virt/hyperv/driver.py
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion nova/virt/hyperv/livemigrationops.py
Expand Up @@ -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"]

Expand Down

0 comments on commit 448a578

Please sign in to comment.