From 026b8f05d79a144a18d08eabf682938c0bc690d0 Mon Sep 17 00:00:00 2001 From: Jessica Mack Date: Thu, 19 Jan 2023 13:44:29 -0500 Subject: [PATCH] added launch file, docker, and supervisor changes Signed-off-by: Jessica Mack --- .../files/launch_awx_cache_clear.sh | 22 +++++++++++++++++++ .../roles/dockerfile/templates/Dockerfile.j2 | 1 + .../dockerfile/templates/supervisor.conf.j2 | 13 ++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh diff --git a/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh b/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh new file mode 100644 index 0000000000..8a1a3e87fd --- /dev/null +++ b/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +if [ `id -u` -ge 500 ]; then + echo "awx:x:`id -u`:`id -g`:,,,:/var/lib/awx:/bin/bash" >> /tmp/passwd + cat /tmp/passwd > /etc/passwd + rm /tmp/passwd +fi + +if [ -n "${AWX_KUBE_DEVEL}" ]; then + pushd /awx_devel + make awx-link + popd + + export SDB_NOTIFY_HOST=$MY_POD_IP +fi + +set -e + +wait-for-migrations + +awx-manage provision_instance + +exec supervisord -c /etc/supervisord_task.conf \ No newline at end of file diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index a74129905b..c6fd7bf044 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -212,6 +212,7 @@ ADD tools/docker-compose/podman-containers.conf /var/lib/awx/.config/containers/ ADD tools/ansible/roles/dockerfile/files/launch_awx.sh /usr/bin/launch_awx.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_task.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh +ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_cache_clear.sh ADD {{ template_dest }}/supervisor.conf /etc/supervisord.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisor_rsyslog.conf diff --git a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 index f72b4a6c26..d1d902a16c 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 @@ -75,8 +75,19 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +[program:awx-cache-clear] +command = awx-manage run_cache_clear +autorestart = true +startsecs = 30 +stopasgroup=true +killasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + [group:tower-processes] -programs=nginx,uwsgi,daphne,wsbroadcast +programs=nginx,uwsgi,daphne,wsbroadcast,awx-cache-clear priority=5 [eventlistener:superwatcher]