openstack/kolla-ansible
Code Issues Proposed changes

Make oslo.log work correctly on RDO platforms

Browse Source 
RDO has backported the oslo.log fix but Ubuntu from source does not have
the proper version of oslo.log with the error correction for syslog.

Change-Id: If91200397e02cf5b696d34d9aa4d6980fbba36c6
Partially-Implements: bp logging-container
This commit is contained in:
Steven Dake 2015-09-28 21:06:14 -07:00
parent 44b5e223f2
commit 00151b2310
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/openstack-base/Dockerfile.j2
View File

@ -1,15 +1,13 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install patch \ RUN yum -y install patch \
&& yum clean all && yum clean all
{% endif %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% if install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
curl \ curl \
@ -50,11 +48,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
python-openstackclient \ python-openstackclient \
MySQL-python MySQL-python
{% endif %}
# TODO(sdake): Remove a backport of a patch which is not yet in the packaging # TODO(sdake): Remove a backport of a patch which is not yet in the packaging
# to make oslo.log work properly once the patch is in oslo.log # to make oslo.log work properly once the patch is in oslo.log
# NB: Please remove patch from the list of packages for both # NB: Please remove patch from the list of packages for both
# RPM and APT. # RPM and APT.
COPY 0001-Fix-unintended-assignment-of-syslog.patch / COPY 0001-Fix-unintended-assignment-of-syslog.patch /
RUN patch -p1 -d /usr/lib/python2.7/site-packages < /0001-Fix-unintended-assignment-of-syslog.patch RUN patch -p1 -d /usr/lib/python2.7/site-packages < /0001-Fix-unintended-assignment-of-syslog.patch
{% endif %}