openstack
/
nova
Code Issues Proposed changes

Merge "Fixes live_migration missing migrate_data parameter in Hyper-V driver" into stable/folsom

This commit is contained in:
Jenkins 2012-11-27 21:41:48 +00:00 committed by Gerrit Code Review
parent d364646f6a 9265eb009f
commit b17b5e096c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/virt/hyperv/driver.py
View File

@ -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)

2
nova/virt/hyperv/livemigrationops.py
View File

@ -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"]