Revert "Adds separate workers to kill migration tasks"

This reverts commit e1160c1d13cf1fbf4aa63c743eca28076991022e.

coriolis/cmd/worker.py

@@ -22,13 +22,6 @@ def main():
         'coriolis_worker', [rpc_server.WorkerServerEndpoint()],
         rpc_server.VERSION)
     launcher.launch_service(server, workers=server.get_workers_count())
-
-    # Use separate workers to kill tasks
-    server_delete_task = service.MessagingService(
-        'coriolis_worker_delete_task', [rpc_server.WorkerServerEndpoint()],
-        rpc_server.VERSION)
-    launcher.launch_service(server_delete_task,
-                            workers=server.get_workers_count())
     launcher.wait()
 
 

coriolis/worker/rpc/client.py

@@ -20,8 +20,7 @@ class WorkerClient(object):
 
     def cancel_task(self, ctxt, server, process_id):
         # Needs to be executed on the same server
-        cctxt = self._client.prepare(server=server,
-                                     topic="coriolis_worker_delete_task")
+        cctxt = self._client.prepare(server=server)
         cctxt.call(ctxt, 'cancel_task', process_id=process_id)
 
     def update_migration_status(self, ctxt, task_id, status):