POC channels 2

tools/docker-compose/bootstrap_development.sh

@@ -4,7 +4,6 @@ set +x
 # Wait for the databases to come up
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all
 ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all
-ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=${RABBITMQ_HOST} port=5672" all
 
 # In case AWX in the container wants to connect to itself, use "docker exec" to attach to the container otherwise
 # TODO: FIX

tools/docker-compose/haproxy.cfg

@@ -22,11 +22,6 @@ frontend localnodes_ssl
     mode tcp
     default_backend nodes_ssl
 
-frontend rabbitctl
-    bind *:15672
-    mode http
-    default_backend rabbitctl_nodes
-
 backend nodes
     mode http
     balance roundrobin
@@ -35,28 +30,16 @@ backend nodes
     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:8013 check
-    server awx_2 awx_2:8013 check
-    server awx_3 awx_3:8013 check
+    server awx-1 awx-1:8013 check
+    server awx-2 awx-2:8013 check
+    server awx-3 awx-3:8013 check
 
 backend nodes_ssl
     mode tcp
     balance roundrobin
-    server awx_1 awx_1:8043
-    server awx_2 awx_2:8043
-    server awx_3 awx_3:8043
-
-backend rabbitctl_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 rabbitmq_1 rabbitmq_1:15672
-    server rabbitmq_2 rabbitmq_2:15672
-    server rabbitmq_3 rabbitmq_3:15672
+    server awx-1 awx-1:8043
+    server awx-2 awx-2:8043
+    server awx-3 awx-3:8043
 
 listen stats
     bind *:1936

tools/docker-compose/supervisor.conf

@@ -27,14 +27,6 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
-[program:awx-runworker]
-command = make runworker
-autostart = true
-autorestart = true
-redirect_stderr=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-
 [program:awx-uwsgi]
 command = make uwsgi
 autostart = true
@@ -64,7 +56,7 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
 [group:tower-processes]
-programs=awx-dispatcher,awx-receiver,awx-runworker,awx-uwsgi,awx-daphne,awx-nginx
+programs=awx-dispatcher,awx-receiver,awx-uwsgi,awx-daphne,awx-nginx
 priority=5
 
 [unix_http_server]