mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 09:25:10 +03:00
Upstream rsyslog packaging changes
- add rsyslog repo to Dockerfile for AWX installation - Update Library Notes for requests-futures removal
This commit is contained in:
parent
589d27c88c
commit
955d57bce6
7
installer/roles/image_build/files/rsyslog.repo
Normal file
7
installer/roles/image_build/files/rsyslog.repo
Normal file
@ -0,0 +1,7 @@
|
||||
[rsyslog_v8]
|
||||
name=Adiscon CentOS-$releasever - local packages for $basearch
|
||||
baseurl=http://rpms.adiscon.com/v8-stable/epel-$releasever/$basearch
|
||||
enabled=1
|
||||
gpgcheck=0
|
||||
gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon
|
||||
protect=1
|
@ -137,6 +137,13 @@
|
||||
mode: '0700'
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Stage rsyslog.repo
|
||||
copy:
|
||||
src: rsyslog.repo
|
||||
dest: "{{ docker_base_path }}/rsyslog.repo"
|
||||
mode: '0700'
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Stage supervisor.conf
|
||||
copy:
|
||||
src: supervisor.conf
|
||||
|
@ -97,6 +97,10 @@ RUN cd /usr/local/bin && \
|
||||
curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz | \
|
||||
tar -xz --strip-components=1 --wildcards --no-anchored 'oc'
|
||||
|
||||
ADD rsyslog.repo /etc/yum.repos.d/
|
||||
RUN yum install -y rsyslog-omhttp
|
||||
RUN echo '$IncludeConfig /var/lib/awx/rsyslog.conf' >> /etc/rsyslog.conf
|
||||
|
||||
# Pre-create things that we need to write to
|
||||
RUN for dir in /home/awx /var/log/tower /var/log/nginx /var/lib/nginx; \
|
||||
do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \
|
||||
|
@ -145,7 +145,3 @@ in the top-level Makefile.
|
||||
Version 4.8 makes us a little bit nervous with changes to `searchwindowsize` https://github.com/pexpect/pexpect/pull/579/files
|
||||
Pin to `pexpect==4.7.x` until we have more time to move to `4.8` and test.
|
||||
|
||||
### requests-futures
|
||||
|
||||
This can be removed when a solution for the external log queuing is ready.
|
||||
https://github.com/ansible/awx/pull/5092
|
||||
|
Loading…
Reference in New Issue
Block a user