Merge pull request #2266 from ansible/celery-tastes-bad

replace the celery-based task queue with a kombu-based implementation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

tools/docker-compose-cluster.yml

@@ -12,7 +12,6 @@ services:
       - "8013:8013"
       - "8043:8043"
       - "1936:1936"
-      - "5555:5555"
       - "15672:15672"
   awx_1:
     privileged: true

tools/docker-compose.yml

@@ -14,10 +14,9 @@ services:
     ports:
       - "8888:8888"
       - "8080:8080"
-      - "5555:5555"
       - "8013:8013"
       - "8043:8043"
-      - "6899-6999:6899-6999"  # default port range for celery.contrib.rdb
+      - "6899-6999:6899-6999"  # default port range for sdb-listen
     links:
       - postgres
       - memcached

tools/docker-compose/Procfile

@@ -1,8 +1,7 @@
 nginx:          make nginx
 runworker:      make runworker
 daphne:         make daphne
-celeryd:        make celeryd
+dispatcher:     make dispatcher
 receiver:       make receiver
-flower:         make flower
 uwsgi:          make uwsgi
-jupyter:        make jupyter
+jupyter:        make jupyter

tools/docker-compose/haproxy.cfg

@@ -22,11 +22,6 @@ frontend localnodes_ssl
     mode tcp
     default_backend nodes_ssl
 
-frontend flower
-    bind *:5555
-    mode http
-    default_backend flower_nodes
-
 frontend rabbitctl
     bind *:15672
     mode http
@@ -51,18 +46,6 @@ backend nodes_ssl
     server awx_2 awx_2:8043
     server awx_3 awx_3:8043
 
-backend flower_nodes
-    mode http
-    balance roundrobin
-    option forwardfor
-    option http-pretend-keepalive
-    http-request set-header X-Forwarded-Port %[dst_port]
-    http-request add-header X-Forwarded-Proto https if { ssl_fc }
-    #option httpchk HEAD / HTTP/1.1\r\nHost:localhost
-    server awx_1 awx_1:5555
-    server awx_2 awx_2:5555
-    server awx_3 awx_3:5555
-
 backend rabbitctl_nodes
     mode http
     balance roundrobin

tools/docker-compose/supervisor.conf

@@ -3,8 +3,8 @@ umask = 022
 minfds = 4096
 nodaemon=true
 
-[program:celeryd]
-command = celery worker -A awx -l DEBUG -B -Ofair --autoscale=100,4 -s /var/lib/awx/beat.db --pidfile /tmp/celery_pid
+[program:dispatcher]
+command = awx-manage run_dispatcher
 autostart = true
 autorestart = true
 redirect_stderr=true
@@ -51,14 +51,6 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:flower]
-command = make flower
-autostart = true
-autorestart = true
-redirect_stderr=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-
 [program:jupyter]
 command = make jupyter
 autostart = true
@@ -68,7 +60,7 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
 [group:awx-processes]
-programs=celeryd,receiver,runworker,uwsgi,daphne,nginx,flower
+programs=dispatcher,receiver,runworker,uwsgi,daphne,nginx
 priority=5
 
 [unix_http_server]