From bed9ed97a4c6fdd6ff92a48e654dc521638e058b Mon Sep 17 00:00:00 2001
From: Hui Kang <kangh@us.ibm.com>
Date: Mon, 8 Feb 2016 02:09:37 -0500
Subject: [PATCH] Remove unnecessary patch for oslo.log
Ubuntu binary package includes the fix
TrivialFix
Change-Id: Iaeff250e75565b1f447d97acfffc1b1a3a76c250
---
docker/openstack-base/Dockerfile.j2 | 4 ----
.../openstack-base/oslo-log-bug1499620.patch | 18 ------------------
2 files changed, 22 deletions(-)
delete mode 100644 docker/openstack-base/oslo-log-bug1499620.patch
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 870dd0bb8f..5e9848929c 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -39,7 +39,6 @@ RUN yum -y install \
# This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive
-COPY oslo-log-bug1499620.patch /var/lib/kolla/oslo-log-bug1499620.patch
# There is no python-tuskarclient in ubuntu 14.04
RUN apt-get install -y --no-install-recommends \
python-barbicanclient \
@@ -65,9 +64,6 @@ RUN apt-get install -y --no-install-recommends \
patch \
&& apt-get clean
-# python-oslo-log patch to bug 1499620 (it fixed in python-oslo-log 1.11.1)
-RUN patch -d /usr/lib/python2.7/site-packages -p1 < /var/lib/kolla/oslo-log-bug1499620.patch
-
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
diff --git a/docker/openstack-base/oslo-log-bug1499620.patch b/docker/openstack-base/oslo-log-bug1499620.patch
deleted file mode 100644
index 7a6867dfbe..0000000000
--- a/docker/openstack-base/oslo-log-bug1499620.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/oslo_log/log.py b/oslo_log/log.py
-index 8d8c240..1b19072 100644
---- a/oslo_log/log.py
-+++ b/oslo_log/log.py
-@@ -285,10 +285,10 @@ def _setup_logging_from_conf(conf, project, version):
- facility = _find_facility(conf.syslog_log_facility)
- # TODO(bogdando) use the format provided by RFCSysLogHandler after
- # existing syslog format deprecation in J
-- syslog = handlers.OSSysLogHandler(
-+ syslog_handler = handlers.OSSysLogHandler(
- facility=facility,
- use_syslog_rfc_format=conf.use_syslog_rfc_format)
-- log_root.addHandler(syslog)
-+ log_root.addHandler(syslog_handler)
-
- datefmt = conf.log_date_format
- for handler in log_root.handlers:
-
--
GitLab