diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2015-04-13 14:47:20 -0700 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2015-04-15 20:13:45 +0000 |
| commit | 33ba90240a2ad3165274d9e54ceb156273404c9a (patch) | |
| tree | 986deb34f08e4d4445d7960ce8673ce9ddbc1011 | |
| parent | dea6116723f22632c2e478e00bb0aafcd2febdc9 (diff) | |
| download | nova-33ba90240a2ad3165274d9e54ceb156273404c9a.tar.gz | |
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
(cherry picked from commit 4e515ec2269a1c3187ee9ffad3a6be059ec74b0b)
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |