From 4be0baa8cd1e994973adf1d53a9929c855a5d918 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Fri, 5 Jun 2020 14:45:55 -0400
Subject: [PATCH] Bump oslo.log to version 4.2.1

There were a couple of versions of oslo.log that were
not backwards-compatible. Now that a fixed version was
released, bump lower-constraints to require it and
remove the temporary workaround.

Change-Id: If38105ceaa48a0520ae8243982b736d0bc99ec3a
Related-bug: #1871840
---
 lower-constraints.txt                                          | 2 +-
 .../services/logapi/drivers/openvswitch/ovs_firewall_log.py    | 3 +--
 requirements.txt                                               | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index e8460aae84a..b436a88f511 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -65,7 +65,7 @@ oslo.config==5.2.0
 oslo.context==2.20.0
 oslo.db==4.37.0
 oslo.i18n==3.20.0
-oslo.log==4.1.2
+oslo.log==4.2.1
 oslo.messaging==5.29.0
 oslo.middleware==3.31.0
 oslo.policy==1.30.0
diff --git a/neutron/services/logapi/drivers/openvswitch/ovs_firewall_log.py b/neutron/services/logapi/drivers/openvswitch/ovs_firewall_log.py
index 3ef6d61d7e0..8e9d2387c4f 100644
--- a/neutron/services/logapi/drivers/openvswitch/ovs_firewall_log.py
+++ b/neutron/services/logapi/drivers/openvswitch/ovs_firewall_log.py
@@ -59,8 +59,7 @@ def setup_logging():
                 fmt=cfg.CONF.logging_default_format_string,
                 datefmt=cfg.CONF.log_date_format))
     elif cfg.CONF.use_journal:
-        # TODO(haleyb): remove when oslo.log is fixed, related bug #1871840
-        journal_handler = handlers.OSJournalHandler(facility=None)
+        journal_handler = handlers.OSJournalHandler()
         LOG.logger.addHandler(journal_handler)
     else:
         syslog_handler = handlers.OSSysLogHandler()
diff --git a/requirements.txt b/requirements.txt
index 2c62bb48d4a..1e53423d35e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.20.0 # Apache-2.0
 oslo.db>=4.37.0 # Apache-2.0
 oslo.i18n>=3.20.0 # Apache-2.0
-oslo.log>=4.1.2 # Apache-2.0
+oslo.log>=4.2.1 # Apache-2.0
 oslo.messaging>=5.29.0 # Apache-2.0
 oslo.middleware>=3.31.0 # Apache-2.0
 oslo.policy>=1.30.0 # Apache-2.0