diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-07 16:50:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-07 16:51:00 +0000 |
| commit | 10ab31b625ca64cda7924ad61ca5369ad2e26243 (patch) | |
| tree | 7c283318c4d2f1ff4bc27485267499e7a1454ad6 | |
| parent | 895e7da3273a1a9de921f1fc8ad409df79d58809 (diff) | |
| parent | 168409fa9313d3643eb7ceea6c8b5f2bef35d86f (diff) | |
| download | nova-10ab31b625ca64cda7924ad61ca5369ad2e26243.tar.gz | |
Merge "Make compute rpcapi 'live_migration' backward compatible" into stable/liberty
| -rw-r--r-- | nova/compute/rpcapi.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 0168c7a11c..af642c57d3 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -547,6 +547,7 @@ class ComputeAPI(object): version = '4.2' if not self.client.can_send_version(version): version = '4.0' + args.pop('migration') cctxt = self.client.prepare(server=host, version=version) cctxt.cast(ctxt, 'live_migration', instance=instance, dest=dest, block_migration=block_migration, |