openstack
/
nova
Code Issues Proposed changes

Pass migrate_data to pre_live_migration 

Commit ebfa09fa19 added an RPC proxy but
as part of that was passing migrate_data=None for pre_live_migration
which breaks live block migration when not using shared storage.

Closes-Bug: #984996

Change-Id: I2a83f1fb0e4468f9a6c67a188af725c3406139d1
This commit is contained in:
Matt Riedemann 2015-04-13 14:47:20 -07:00
parent f25fbd6c15
commit 4e515ec226
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -6673,7 +6673,7 @@ class _ComputeV4Proxy(object):
def pre_live_migration(self, ctxt, instance, block_migration, disk,
migrate_data=None):
return self.manager.pre_live_migration(ctxt, instance, block_migration,
disk, migrate_data=None)
disk, migrate_data=migrate_data)
def prep_resize(self, ctxt, image, instance, instance_type,
reservations=None, request_spec=None,