diff options
| author | Dan Smith <dansmith@redhat.com> | 2015-04-10 07:10:52 -0700 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2015-04-15 19:53:21 +0000 |
| commit | 97145ba175291d6522afa079860c72220e43024a (patch) | |
| tree | 80a906ce502879038a77b6098efe568d7d908e42 | |
| parent | 77d19b97c69d48ef2512fb3d14b0486ed2137b39 (diff) | |
| download | nova-97145ba175291d6522afa079860c72220e43024a.tar.gz | |
Fix check_can_live_migrate_destination() in ComputeV4Proxy
There was a mismatch in the V4 proxy in the call signatures of this
function. This was missed because the "destination" parameter is passed
in the rpcapi as the host to contact, which is consumed by the rpc
layer and not passed. Since it was not called one of the standard
names (either host if to be not passed, or host_param if to be passed),
this was missed.
Change-Id: Idf2160934dade650ed02b672f3b64cb26247f8e6
Closes-Bug: #1442602
(cherry picked from commit 0c08f7f2ef070f7c6172d7742f9789e0a8bda91a)
| -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 aa56396613..0e3e670492 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6582,10 +6582,10 @@ class _ComputeV4Proxy(object): def change_instance_metadata(self, ctxt, instance, diff): return self.manager.change_instance_metadata(ctxt, instance, diff) - def check_can_live_migrate_destination(self, ctxt, instance, destination, + def check_can_live_migrate_destination(self, ctxt, instance, block_migration, disk_over_commit): return self.manager.check_can_live_migrate_destination( - ctxt, instance, destination, block_migration, disk_over_commit) + ctxt, instance, block_migration, disk_over_commit) def check_can_live_migrate_source(self, ctxt, instance, dest_check_data): return self.manager.check_can_live_migrate_source(ctxt, instance, |