diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 10:46:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 10:46:43 +0000 |
| commit | 916ce6f6efe46964f4d9afafd8bedb0cc2779183 (patch) | |
| tree | 244ba46ca3608bdaab4c09b811e8dcdf067f5a3e | |
| parent | 22d7547c6b62fb9dabd861e4941edd34eedabfc6 (diff) | |
| parent | 97145ba175291d6522afa079860c72220e43024a (diff) | |
| download | nova-916ce6f6efe46964f4d9afafd8bedb0cc2779183.tar.gz | |
Merge "Fix check_can_live_migrate_destination() in ComputeV4Proxy" into stable/kilo
| -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, |