diff options
| author | Timofey Durakov <tdurakov@mirantis.com> | 2015-04-10 19:38:33 +0300 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2015-04-15 20:13:45 +0000 |
| commit | dea6116723f22632c2e478e00bb0aafcd2febdc9 (patch) | |
| tree | ebaf800f375e0598362215e61f54263d1ed51051 | |
| parent | 97145ba175291d6522afa079860c72220e43024a (diff) | |
| download | nova-dea6116723f22632c2e478e00bb0aafcd2febdc9.tar.gz | |
Fixed order of arguments during execution live_migrate()
order of arguments that passed to
ComputeManager.live_,migration() differs in ComputeManager and
_ComputeV4Proxy classes
Change-Id: I23c25d219e9cdd0673ae6a12250219680fb7bda9
Closes-Bug:#1442656
(cherry picked from commit ba521fa53711774e0718808fe333aca676de57ae)
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0e3e670492..43ded976e8 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6656,9 +6656,9 @@ class _ComputeV4Proxy(object): def inject_network_info(self, ctxt, instance): return self.manager.inject_network_info(ctxt, instance) - def live_migration(self, ctxt, instance, dest, block_migration, + def live_migration(self, ctxt, dest, instance, block_migration, migrate_data=None): - return self.manager.live_migration(ctxt, instance, dest, + return self.manager.live_migration(ctxt, dest, instance, block_migration, migrate_data=migrate_data) |