From 9489f00ca4e600a2dc0baee3af4bba06326bc7af Mon Sep 17 00:00:00 2001
From: Christian Adams <chadams@redhat.com>
Date: Thu, 2 Apr 2020 11:42:53 -0400
Subject: [PATCH] Align k8 and ocp supervisor scripts  - Handle scl enable
 calls for python processes that use postgresql  - Handle ocp specific vars
 better

---
 installer/roles/image_build/files/supervisor.conf      | 4 ++--
 installer/roles/kubernetes/templates/configmap.yml.j2  | 3 +++
 installer/roles/kubernetes/templates/supervisor.yml.j2 | 4 ++--
 installer/roles/kubernetes/vars/kubernetes.yml         | 2 ++
 installer/roles/kubernetes/vars/openshift.yml          | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 installer/roles/kubernetes/vars/kubernetes.yml

diff --git a/installer/roles/image_build/files/supervisor.conf b/installer/roles/image_build/files/supervisor.conf
index acc1af1d6b..fc402c8092 100644
--- a/installer/roles/image_build/files/supervisor.conf
+++ b/installer/roles/image_build/files/supervisor.conf
@@ -13,7 +13,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:uwsgi]
-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
+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'
 directory = /var/lib/awx
 autostart = true
 autorestart = true
@@ -25,7 +25,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:daphne]
-command = /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 --websocket_timeout -1 awx.asgi:channel_layer'
 directory = /var/lib/awx
 autostart = true
 autorestart = true
diff --git a/installer/roles/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2
index 9c91eebba7..e1164f759c 100644
--- a/installer/roles/kubernetes/templates/configmap.yml.j2
+++ b/installer/roles/kubernetes/templates/configmap.yml.j2
@@ -205,6 +205,9 @@ 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('') }}"
+    REDHAT_CANDLEPIN_VERIFY = "{{ candlepin_verify | default('') }}"
     BROADCAST_WEBSOCKET_PORT = 8052
     BROADCAST_WEBSOCKET_PROTOCOL = 'http'
 
diff --git a/installer/roles/kubernetes/templates/supervisor.yml.j2 b/installer/roles/kubernetes/templates/supervisor.yml.j2
index 407651e6f9..e5c2e0624d 100644
--- a/installer/roles/kubernetes/templates/supervisor.yml.j2
+++ b/installer/roles/kubernetes/templates/supervisor.yml.j2
@@ -20,7 +20,7 @@ data:
     stderr_logfile_maxbytes=0
 
     [program:uwsgi]
-    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
+    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'
     directory = /var/lib/awx
     autostart = true
     autorestart = true
@@ -32,7 +32,7 @@ data:
     stderr_logfile_maxbytes=0
 
     [program:daphne]
-    command = /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 --websocket_timeout -1 awx.asgi:channel_layer'
     directory = /var/lib/awx
     autostart = true
     autorestart = true
diff --git a/installer/roles/kubernetes/vars/kubernetes.yml b/installer/roles/kubernetes/vars/kubernetes.yml
new file mode 100644
index 0000000000..28f5607e55
--- /dev/null
+++ b/installer/roles/kubernetes/vars/kubernetes.yml
@@ -0,0 +1,2 @@
+---
+uwsgi_bash: "bash -c"
\ No newline at end of file
diff --git a/installer/roles/kubernetes/vars/openshift.yml b/installer/roles/kubernetes/vars/openshift.yml
index 95f3d01eb8..6459bfde3d 100644
--- a/installer/roles/kubernetes/vars/openshift.yml
+++ b/installer/roles/kubernetes/vars/openshift.yml
@@ -1,3 +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"
\ No newline at end of file