From 69ec49d0e9113f59eed2fc4d2968511450c0830f Mon Sep 17 00:00:00 2001 From: Marcelo Moreira de Mello Date: Wed, 5 Jan 2022 17:02:14 -0500 Subject: [PATCH] Disable awx-config-watcher on OCP --- tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 2 +- tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 | 2 ++ .../ansible/roles/dockerfile/templates/supervisor_task.conf.j2 | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index 8aeecf70d4..6f8c13f3f9 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -208,13 +208,13 @@ ADD tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.defaul ADD tools/docker-compose/start_tests.sh /start_tests.sh ADD tools/docker-compose/bootstrap_development.sh /usr/bin/bootstrap_development.sh ADD tools/docker-compose/entrypoint.sh /entrypoint.sh +ADD tools/scripts/config-watcher /usr/bin/config-watcher {% else %} 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/settings.py /etc/tower/settings.py ADD {{ template_dest }}/supervisor.conf /etc/supervisord.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf -ADD tools/scripts/config-watcher /usr/bin/config-watcher {% endif %} {% if (build_dev|bool) or (kube_dev|bool) %} ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link diff --git a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 index 56210abb77..e43f85df58 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor.conf.j2 @@ -98,6 +98,7 @@ priority=5 # TODO: Exit Handler +{% if kube_dev | bool %} [eventlistener:awx-config-watcher] command=/usr/bin/config-watcher stderr_logfile=/dev/stdout @@ -106,6 +107,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 events=TICK_60 priority=0 +{% endif %} [unix_http_server] file=/var/run/supervisor/supervisor.web.sock diff --git a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 index 994323e6a8..1e2d025e43 100644 --- a/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 +++ b/tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2 @@ -47,6 +47,7 @@ priority=5 # TODO: Exit Handler +{% if kube_dev | bool %} [eventlistener:awx-config-watcher] command=/usr/bin/config-watcher stderr_logfile=/dev/stdout @@ -55,6 +56,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 events=TICK_60 priority=0 +{% endif %} [unix_http_server] file=/var/run/supervisor/supervisor.sock