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/compute | |
| parent | c9f15e3a51658c6b406521d87a95e94f25edf977 (diff) | |
Remove topic from scheduler run_instance.
This argument to run_instance was unused, so just remove it.
Change-Id: I42366514285a2355f647c776af140effc1618b7d
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 4f3b458c4..7ff66aa93 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -745,7 +745,7 @@ class API(base.Base): } return self.scheduler_rpcapi.run_instance(context, - topic=FLAGS.compute_topic, request_spec=request_spec, + request_spec=request_spec, admin_password=admin_password, injected_files=injected_files, requested_networks=requested_networks, is_first_time=True, filter_properties=filter_properties, diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a8d325b4b..0f24a2546 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -598,7 +598,7 @@ class ComputeManager(manager.SchedulerDependentManager): LOG.debug(_("Re-scheduling instance: attempt %d"), retry['num_attempts'], instance_uuid=instance_uuid) - self.scheduler_rpcapi.run_instance(context, FLAGS.compute_topic, + self.scheduler_rpcapi.run_instance(context, request_spec, admin_password, injected_files, requested_networks, is_first_time, filter_properties, reservations=None, call=False) |