From 00151b23100daa944d3e78dbed38958aa4f7e991 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 28 Sep 2015 21:06:14 -0700 Subject: [PATCH] Make oslo.log work correctly on RDO platforms 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 --- docker/openstack-base/Dockerfile.j2 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 36c1c1c347..6a0604595f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,15 +1,13 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} 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 \ && yum clean all -{% endif %} - -{% if install_type == 'source' %} - {% if base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ curl \ @@ -50,11 +48,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ python-openstackclient \ MySQL-python -{% endif %} - # 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 # NB: Please remove patch from the list of packages for both # RPM and APT. 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 + +{% endif %}