External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 16:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make supervisor more consistent

Browse Source 
Configs go in /etc, sockets in /var/run/supervisor for all invocations.
This commit is contained in:
Bill Nottingham
2020-05-28 17:38:16 -04:00
parent ec2c121762
commit 559d917184
10 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -144,12 +144,12 @@ spec:
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-web-config
mountPath: "/supervisor.conf"
mountPath: "/etc/supervisord.conf"
subPath: supervisor.conf
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-task-config
mountPath: "/supervisor_task.conf"
mountPath: "/etc/supervisord_task.conf"
subPath: supervisor_task.conf
readOnly: true
@@ -220,12 +220,12 @@ spec:
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-web-config
mountPath: "/supervisor.conf"
mountPath: "/etc/supervisord.conf"
subPath: supervisor.conf
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-task-config
mountPath: "/supervisor_task.conf"
mountPath: "/etc/supervisord_task.conf"
subPath: supervisor_task.conf
readOnly: true
@@ -241,7 +241,7 @@ spec:
mountPath: "/var/run/memcached"
env:
- name: SUPERVISOR_WEB_CONFIG_PATH
value: "/supervisor.conf"
value: "/etc/supervisord.conf"
- name: AWX_SKIP_MIGRATIONS
value: "1"
- name: MY_POD_UID

4
installer/roles/kubernetes/templates/launch_awx.yml.j2
View File

@@ -35,7 +35,7 @@ data:
unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
supervisord -c /supervisor_task.conf
supervisord -c /etc/supervisord_task.conf
launch-awx-web: |
#!/usr/bin/env bash
@@ -54,5 +54,5 @@ data:
unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh)
supervisord -c /supervisor.conf
supervisord -c /etc/supervisord.conf

10
installer/roles/kubernetes/templates/supervisor.yml.j2
View File

@@ -8,6 +8,9 @@ data:
[supervisord]
nodaemon = True
umask = 022
logfile = /dev/stdout
logfile_maxbytes = 0
pidfile = /var/run/supervisor/supervisor.web.pid
[program:nginx]
command = nginx -g "daemon off;"
@@ -93,6 +96,9 @@ data:
[supervisord]
nodaemon = True
umask = 022
logfile = /dev/stdout
logfile_maxbytes = 0
pidfile = /var/run/supervisor/supervisor.pid
[program:dispatcher]
command = awx-manage run_dispatcher
@@ -133,10 +139,10 @@ data:
priority=0
[unix_http_server]
file=/tmp/supervisor.sock
file=/var/run/supervisor/supervisor.sock
[supervisorctl]
serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket
serverurl=unix:///var/run/supervisor/supervisor.sock ; use a unix:// URL for a unix socket
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface