diff --git a/installer/roles/image_build/files/rsyslog.repo b/installer/roles/image_build/files/rsyslog.repo new file mode 100644 index 0000000000..4cc2a35a42 --- /dev/null +++ b/installer/roles/image_build/files/rsyslog.repo @@ -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 diff --git a/installer/roles/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml index 4694dcd15f..51e9b239ab 100644 --- a/installer/roles/image_build/tasks/main.yml +++ b/installer/roles/image_build/tasks/main.yml @@ -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 diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index fa1e3cc1d7..44668ec6b8 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -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 && \ diff --git a/requirements/README.md b/requirements/README.md index 3afa92434e..4ce399a7e9 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -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