Merge "Remove unnecessary patch for oslo.log"

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'] %}

docker/openstack-base/oslo-log-bug1499620.patch

-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:
-