align with configmap changes

installer/roles/image_build/files/supervisor.conf

@@ -13,7 +13,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:uwsgi]
-command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768'
+command = /var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768
 directory = /var/lib/awx
 autostart = true
 autorestart = true
@@ -25,7 +25,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:daphne]
-command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer'
+command = /var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer
 directory = /var/lib/awx
 autostart = true
 autorestart = true

installer/roles/kubernetes/defaults/main.yml

@@ -55,3 +55,5 @@ custom_venvs_python: "python2"
 ca_trust_bundle: "/etc/pki/tls/certs/ca-bundle.crt"
 
 container_groups_image: "ansible/ansible-runner"
+
+uwsgi_bash: "bash -c"

installer/roles/kubernetes/templates/configmap.yml.j2

@@ -205,9 +205,8 @@ data:
     USE_X_FORWARDED_PORT = True
 
     AWX_CONTAINER_GROUP_DEFAULT_IMAGE = "{{ container_groups_image }}"
-    {% if candlepin_host is defined %}
+    REDHAT_CANDLEPIN_HOST = "{{ candlepin_host  | default(omit) }}"
-    REDHAT_CANDLEPIN_HOST = "{{ candlepin_host  | default('') }}"
+    REDHAT_CANDLEPIN_VERIFY = "{{ candlepin_verify | default(omit) }}"
-    REDHAT_CANDLEPIN_VERIFY = "{{ candlepin_verify | default('') }}"
     BROADCAST_WEBSOCKET_PORT = 8052
     BROADCAST_WEBSOCKET_PROTOCOL = 'http'
 

installer/roles/kubernetes/templates/launch_awx.yml.j2

@@ -57,3 +57,4 @@ data:
     unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
 
     supervisord -c /supervisor.conf
+

installer/roles/kubernetes/templates/supervisor.yml.j2

@@ -32,7 +32,18 @@ data:
     stderr_logfile_maxbytes=0
 
     [program:daphne]
-    command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer'
+    command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 awx.asgi:channel_layer'
+    directory = /var/lib/awx
+    autostart = true
+    autorestart = true
+    stopwaitsecs = 5
+    stdout_logfile=/dev/stdout
+    stdout_logfile_maxbytes=0
+    stderr_logfile=/dev/stderr
+    stderr_logfile_maxbytes=0
+
+    [program:wsbroadcast]
+    command = awx-manage run_wsbroadcast
     directory = /var/lib/awx
     autostart = true
     autorestart = true
@@ -43,7 +54,7 @@ data:
     stderr_logfile_maxbytes=0
 
     [group:tower-processes]
-    programs=nginx,uwsgi,daphne
+    programs=nginx,uwsgi,daphne,wsbroadcast
     priority=5
 
     # TODO: Exit Handler
@@ -94,19 +105,8 @@ data:
     stderr_logfile=/dev/stderr
     stderr_logfile_maxbytes=0
 
-    [program:channels-worker]
-    command = awx-manage runworker --only-channels websocket.*
-    directory = /var/lib/awx
-    autostart = true
-    autorestart = true
-    stopwaitsecs = 5
-    stdout_logfile=/dev/stdout
-    stdout_logfile_maxbytes=0
-    stderr_logfile=/dev/stderr
-    stderr_logfile_maxbytes=0
-
     [group:tower-processes]
-    programs=dispatcher,callback-receiver,channels-worker
+    programs=dispatcher,callback-receiver
     priority=5
 
     # TODO: Exit Handler
@@ -128,3 +128,4 @@ data:
 
     [rpcinterface:supervisor]
     supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+

installer/roles/kubernetes/vars/kubernetes.yml

@@ -1,2 +0,0 @@
----
-uwsgi_bash: "bash -c"

installer/roles/kubernetes/vars/openshift.yml

@@ -1,4 +1,4 @@
 ---
 openshift_oc_config_file: "{{ kubernetes_base_path }}/.kube/config"
 openshift_oc_bin: "oc --config={{ openshift_oc_config_file }}"
-uwsgi_bash: "scl enable rh-postgresql10"
+uwsgi_bash: "scl enable rh-postgresql10"