From e9ed7ca403e55fb231ece5c56d7f44a49234ad48 Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 13 Oct 2015 09:52:45 +0900 Subject: Remove obsolete backport for oslo.log The patch was merged upstream. Remove it from kolla tree since it doesn't apply cleanly anymore and break openstack-base image building. backport: liberty Change-Id: Ia82aa10860d24d696a172ec6596076c9b6b2d0a5 Closes-Bug: #1505456 --- docker/openstack-base/Dockerfile.j2 | 9 --------- 1 file changed, 9 deletions(-) (limited to 'docker/openstack-base/Dockerfile.j2') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index f730a2de4..345a1b604 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -8,7 +8,6 @@ RUN yum -y install \ mariadb-libs \ MySQL-python \ openssl \ - patch \ && yum clean all {% endif %} @@ -68,7 +67,6 @@ RUN apt-get install -y --no-install-recommends \ libxslt1-dev \ libffi-dev \ libyaml-dev \ - patch \ pkg-config \ git \ && apt-get clean @@ -97,11 +95,4 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ python-openstackclient \ MySQL-python -# 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 %} -- cgit v1.2.3