From 4e515ec2269a1c3187ee9ffad3a6be059ec74b0b Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 13 Apr 2015 14:47:20 -0700 Subject: [PATCH] Pass migrate_data to pre_live_migration Commit ebfa09fa197a1d88d1b3ab1f308232c3df7dc009 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 --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 43ded976e8..708d73451b 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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,