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

Fix permissions on rsyslog.conf for k8s

Browse Source
This commit is contained in:
Christian Adams
2020-04-13 19:33:23 -04:00
parent a0e31b9c01
commit ca7c840d8c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/constants.py
View File

@@ -38,7 +38,7 @@ ENV_BLACKLIST = frozenset((
'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'MAX_EVENT_RES', 'AD_HOC_COMMAND_ID', 'REST_API_URL', 'REST_API_TOKEN', 'MAX_EVENT_RES',
'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE', 'CALLBACK_QUEUE', 'CALLBACK_CONNECTION', 'CACHE',
'JOB_CALLBACK_DEBUG', 'INVENTORY_HOSTVARS', 'JOB_CALLBACK_DEBUG', 'INVENTORY_HOSTVARS',
'AWX_HOST', 'PROJECT_REVISION' 'AWX_HOST', 'PROJECT_REVISION', 'SUPERVISOR_WEB_CONFIG_PATH'
)) ))
# loggers that may be called in process of emitting a log # loggers that may be called in process of emitting a log

2
installer/roles/image_build/tasks/main.yml
View File

@@ -148,7 +148,7 @@
copy: copy:
src: rsyslog.conf src: rsyslog.conf
dest: "{{ docker_base_path }}/rsyslog.conf" dest: "{{ docker_base_path }}/rsyslog.conf"
mode: '0700' mode: '0660'
delegate_to: localhost delegate_to: localhost
- name: Stage supervisor.conf - name: Stage supervisor.conf

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

@@ -98,6 +98,8 @@ spec:
mountPath: "/var/run/supervisor" mountPath: "/var/run/supervisor"
- name: rsyslog-socket - name: rsyslog-socket
mountPath: "/var/run/rsyslog" mountPath: "/var/run/rsyslog"
- name: rsyslog-dir
mountPath: "/var/lib/awx/rsyslog"
{% if ca_trust_dir is defined %} {% if ca_trust_dir is defined %}
- name: {{ kubernetes_deployment_name }}-ca-trust-dir - name: {{ kubernetes_deployment_name }}-ca-trust-dir
mountPath: "/etc/pki/ca-trust/source/anchors/" mountPath: "/etc/pki/ca-trust/source/anchors/"
@@ -182,6 +184,8 @@ spec:
mountPath: "/var/run/supervisor" mountPath: "/var/run/supervisor"
- name: rsyslog-socket - name: rsyslog-socket
mountPath: "/var/run/rsyslog" mountPath: "/var/run/rsyslog"
- name: rsyslog-dir
mountPath: "/var/lib/awx/rsyslog"
{% if ca_trust_dir is defined %} {% if ca_trust_dir is defined %}
- name: {{ kubernetes_deployment_name }}-ca-trust-dir - name: {{ kubernetes_deployment_name }}-ca-trust-dir
mountPath: "/etc/pki/ca-trust/source/anchors/" mountPath: "/etc/pki/ca-trust/source/anchors/"
@@ -327,6 +331,8 @@ spec:
emptyDir: {} emptyDir: {}
- name: rsyslog-socket - name: rsyslog-socket
emptyDir: {} emptyDir: {}
- name: rsyslog-dir
emptyDir: {}
{% if ca_trust_dir is defined %} {% if ca_trust_dir is defined %}
- name: {{ kubernetes_deployment_name }}-ca-trust-dir - name: {{ kubernetes_deployment_name }}-ca-trust-dir
hostPath: hostPath: