External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 03:47:36 -02: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

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

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