remove kombu

awx/main/management/commands/run_callback_receiver.py

@@ -3,7 +3,6 @@
 
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from kombu import Exchange, Queue, Connection
 
 from awx.main.dispatch.worker import AWXConsumerRedis, CallbackBrokerWorker
 
@@ -17,17 +16,15 @@ class Command(BaseCommand):
     help = 'Launch the job callback receiver'
 
     def handle(self, *arg, **options):
-        with Connection(settings.BROKER_URL, transport_options=settings.BROKER_TRANSPORT_OPTIONS) as conn:
-            consumer = None
-            try:
-                consumer = AWXConsumerRedis(
-                    'callback_receiver',
-                    conn,
-                    CallbackBrokerWorker(),
-                    queues=[getattr(settings, 'CALLBACK_QUEUE', '')],
-                )
-                consumer.run()
-            except KeyboardInterrupt:
-                print('Terminating Callback Receiver')
-                if consumer:
-                    consumer.stop()
+        consumer = None
+        try:
+            consumer = AWXConsumerRedis(
+                'callback_receiver',
+                CallbackBrokerWorker(),
+                queues=[getattr(settings, 'CALLBACK_QUEUE', '')],
+            )
+            consumer.run()
+        except KeyboardInterrupt:
+            print('Terminating Callback Receiver')
+            if consumer:
+                consumer.stop()

awx/main/management/commands/run_dispatcher.py

@@ -5,8 +5,7 @@ import logging
 from django.conf import settings
 from django.core.cache import cache as django_cache
 from django.core.management.base import BaseCommand
-from django.db import connection as django_connection
-from kombu import Exchange, Queue
+from django.db import connection as django_connection, connections
 
 from awx.main.utils.handlers import AWXProxyHandler
 from awx.main.dispatch import get_local_queuename, reaper
@@ -66,7 +65,6 @@ class Command(BaseCommand):
             queues = ['tower_broadcast_all', get_local_queuename()]
             consumer = AWXConsumerPG(
                 'dispatcher',
-                None,
                 TaskWorker(),
                 queues,
                 AutoscalePool(min_workers=4)