diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-08-03 15:43:26 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-08-06 15:09:33 -0400 |
| commit | ce2da5e52b743a15d87bab8b7546449ceb4e6871 (patch) | |
| tree | 987d2a3901556ca62941ff47a60186d8db23c7af /nova/scheduler/rpcapi.py | |
| parent | c9f15e3a51658c6b406521d87a95e94f25edf977 (diff) | |
| download | nova-ce2da5e52b743a15d87bab8b7546449ceb4e6871.tar.gz nova-ce2da5e52b743a15d87bab8b7546449ceb4e6871.tar.xz nova-ce2da5e52b743a15d87bab8b7546449ceb4e6871.zip | |
Remove topic from scheduler run_instance.
This argument to run_instance was unused, so just remove it.
Change-Id: I42366514285a2355f647c776af140effc1618b7d
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 60de98c91..a553b202c 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -36,6 +36,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): - remove instance_uuid, add instance - remove instance_type_id, add instance_type - remove topic, it was unused + 1.2 - Remove topic from run_instance, it was unused ''' BASE_RPC_API_VERSION = '1.0' @@ -44,17 +45,17 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): super(SchedulerAPI, self).__init__(topic=FLAGS.scheduler_topic, default_version=self.BASE_RPC_API_VERSION) - def run_instance(self, ctxt, topic, request_spec, admin_password, + def run_instance(self, ctxt, request_spec, admin_password, injected_files, requested_networks, is_first_time, filter_properties, reservations, call=True): rpc_method = self.call if call else self.cast - return rpc_method(ctxt, self.make_msg('run_instance', topic=topic, + return rpc_method(ctxt, self.make_msg('run_instance', request_spec=request_spec, admin_password=admin_password, injected_files=injected_files, requested_networks=requested_networks, is_first_time=is_first_time, filter_properties=filter_properties, - reservations=reservations)) + reservations=reservations), version='1.2') def prep_resize(self, ctxt, instance, instance_type, image, update_db, request_spec, filter_properties): |