External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11508 from tchellomello/awx-config-watcher-dies-ocp

Browse Source 
Disable awx-config-watcher for k8s images
This commit is contained in:
Christian Adams 2022-01-07 10:01:19 -05:00 committed by GitHub
commit 25eaace4be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ansible/roles/dockerfile/templates/Dockerfile.j2
View File

@ -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

2
tools/ansible/roles/dockerfile/templates/supervisor.conf.j2
View File

@ -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

2
tools/ansible/roles/dockerfile/templates/supervisor_task.conf.j2
View File

@ -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