Merge branch 'feature_web-task-split' into 13437-cache-clear

tools/ansible/roles/dockerfile/templates/supervisor.conf.j2

@@ -22,12 +22,11 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:uwsgi]
-
 {% if kube_dev | bool %}
 command = make uwsgi
 directory = /awx_devel
 environment =
-    DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne tower-processes:wsbroadcast'
+    DEV_RELOAD_COMMAND='supervisorctl -c /etc/supervisord_task.conf restart all; supervisorctl restart tower-processes:daphne'
 {% else %}
 command = /var/lib/awx/venv/awx/bin/uwsgi /etc/tower/uwsgi.ini
 directory = /var/lib/awx
@@ -58,12 +57,12 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
-[program:wsbroadcast]
+[program:heartbeet]
 {% if kube_dev | bool %}
-command = make wsbroadcast
+command = make heartbeet
 directory = /awx_devel
 {% else %}
-command = awx-manage run_wsbroadcast
+command = awx-manage run_heartbeet
 directory = /var/lib/awx
 {% endif %}
 autorestart = true

tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2

@@ -22,6 +22,23 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
+[program:wsrelay]
+{% if kube_dev | bool %}
+command = make wsrelay
+directory = /awx_devel
+{% else %}
+command = awx-manage run_wsrelay
+directory = /var/lib/awx
+{% endif %}
+autorestart = true
+startsecs = 30
+stopasgroup=true
+killasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
 [program:callback-receiver]
 {% if kube_dev | bool %}
 command = make receiver
@@ -40,7 +57,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [group:tower-processes]
-programs=dispatcher,callback-receiver
+programs=dispatcher,callback-receiver,wsrelay
 priority=5
 
 [eventlistener:superwatcher]