diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2012-08-08 21:09:14 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2012-08-08 22:49:27 +0000 |
| commit | 10a5f1ac025f89f84398be308455b72d77602cc3 (patch) | |
| tree | 39daef4810ec46b84940ce0f78f6d03d133386de /nova/scheduler/rpcapi.py | |
| parent | 28a03d9aded97732038eadd5bbcb21282f1b246a (diff) | |
| download | nova-10a5f1ac025f89f84398be308455b72d77602cc3.tar.gz nova-10a5f1ac025f89f84398be308455b72d77602cc3.tar.xz nova-10a5f1ac025f89f84398be308455b72d77602cc3.zip | |
scheduler prep_resize should not update instance['host']
This is done by the manager once things are ready on the destination
compute node.
Fixes bug 1034593
Also removes now-unneeded update_db argument passed via rpcapi and bumps
scheduler rpcapi version for prep_resize to 1.4
Change-Id: I0ac3be39877f3afcf42f5996d0da90042fe7c6e3
Diffstat (limited to 'nova/scheduler/rpcapi.py')
| -rw-r--r-- | nova/scheduler/rpcapi.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 9965a162e..737bccb83 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -38,6 +38,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): - remove topic, it was unused 1.2 - Remove topic from run_instance, it was unused 1.3 - Remove instance_id, add instance to live_migration + 1.4 - Remove update_db from prep_resize ''' BASE_RPC_API_VERSION = '1.0' @@ -59,13 +60,13 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): reservations=reservations), version='1.2') def prep_resize(self, ctxt, instance, instance_type, image, - update_db, request_spec, filter_properties): + request_spec, filter_properties): instance_p = jsonutils.to_primitive(instance) instance_type_p = jsonutils.to_primitive(instance_type) self.cast(ctxt, self.make_msg('prep_resize', instance=instance_p, instance_type=instance_type_p, - image=image, update_db=update_db, request_spec=request_spec, - filter_properties=filter_properties), version='1.1') + image=image, request_spec=request_spec, + filter_properties=filter_properties), version='1.4') def show_host_resources(self, ctxt, host): return self.call(ctxt, self.make_msg('show_host_resources', host=host)) |