From e3f4cc6980b23f33cdf7d14767a775f5b688f9e2 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Tue, 20 Aug 2013 22:00:30 +0000 Subject: [PATCH] Fix scheduler prep_resize deprecated comments The scheduler prep_resize RPC method is still used by the compute manager for scheduler retries on prep_resize failures. It is not deprecated yet despite the comments saying so. This removes the comments for now. Change-Id: I858abff1bf08c7ecf50333b8776b18fc08730145 --- nova/scheduler/rpcapi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 78d8cb51..794c0389 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -68,7 +68,8 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): handle the version_cap being set to 2.6. 2.7 - Add select_destinations() - 2.8 - Deprecate prep_resize() + 2.8 - Deprecate prep_resize() -- JUST KIDDING. It is still used + by the compute manager for retries. 2.9 - Added the leagacy_bdm_in_spec parameter to run_instances ''' @@ -109,8 +110,6 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): filter_properties=filter_properties, legacy_bdm_in_spec=legacy_bdm_in_spec), version='2.9') - # NOTE(timello): This method is deprecated and it's functionality has - # been moved to conductor. This should be removed in RPC_API_VERSION 3.0. def prep_resize(self, ctxt, instance, instance_type, image, request_spec, filter_properties, reservations): instance_p = jsonutils.to_primitive(instance)