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

Resolve conflict 2

Browse Source
This commit is contained in:
mosad
2020-06-06 00:17:26 +02:00
parent 7d0c49c043
commit 1e6437b773
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,12 +214,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
@@ -294,12 +294,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
@@ -315,7 +315,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
@@ -591,4 +591,4 @@ spec:
name: {{ kubernetes_deployment_name }}-web-svc
weight: 100
wildcardPolicy: None
{% endif %}
{% endif %}