openstack
/
neutron
Code Issues Proposed changes

Bump oslo.log to version 4.1.2 

Versions of oslo.log >= 4.1.2 require a second argument when
initializing the OSJournalHandler class. While I've started
a review to fix that regression [0], bump oslo.log to a later
version that requires this new flag and pass it to fix the
gate.

Also had to blacklist the OVN tempest IPv6 hotplug test
since it is failing too much to pass the check jobs.

[0] https://review.opendev.org/732457

Change-Id: Ic9bbb43aa832ad6cc45d57328b40afe4468ddfca
Related-bug: #1871840
Related-bug: #1881558
This commit is contained in:
Brian Haley 2020-06-01 18:01:21 -04:00
parent 31280695a2
commit 1a3811448d
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lower-constraints.txt
View File

@ -62,20 +62,20 @@ osc-lib==1.8.0
oslo.cache==1.26.0 oslo.cache==1.26.0
oslo.concurrency==3.26.0 oslo.concurrency==3.26.0
oslo.config==5.2.0 oslo.config==5.2.0
oslo.context==2.19.2 oslo.context==2.20.0
oslo.db==4.37.0 oslo.db==4.37.0
oslo.i18n==3.15.3 oslo.i18n==3.20.0
oslo.log==3.36.0 oslo.log==4.1.2
oslo.messaging==5.29.0 oslo.messaging==5.29.0
oslo.middleware==3.31.0 oslo.middleware==3.31.0
oslo.policy==1.30.0 oslo.policy==1.30.0
oslo.privsep==1.32.0 oslo.privsep==1.32.0
oslo.reports==1.18.0 oslo.reports==1.18.0
oslo.rootwrap==5.8.0 oslo.rootwrap==5.8.0
oslo.serialization==2.18.0 oslo.serialization==2.25.0
oslo.service==1.24.0 oslo.service==1.24.0
oslo.upgradecheck==0.1.0 oslo.upgradecheck==0.1.0
oslo.utils==3.33.0 oslo.utils==3.36.0
oslo.versionedobjects==1.35.1 oslo.versionedobjects==1.35.1
oslotest==3.2.0 oslotest==3.2.0
osprofiler==2.3.0 osprofiler==2.3.0

3
neutron/services/logapi/drivers/openvswitch/ovs_firewall_log.py
View File

@ -59,7 +59,8 @@ def setup_logging():
fmt=cfg.CONF.logging_default_format_string, fmt=cfg.CONF.logging_default_format_string,
datefmt=cfg.CONF.log_date_format)) datefmt=cfg.CONF.log_date_format))
elif cfg.CONF.use_journal: elif cfg.CONF.use_journal:
journal_handler = handlers.OSJournalHandler() # TODO(haleyb): remove when oslo.log is fixed, related bug #1871840
journal_handler = handlers.OSJournalHandler(facility=None)
LOG.logger.addHandler(journal_handler) LOG.logger.addHandler(journal_handler)
else: else:
syslog_handler = handlers.OSSysLogHandler() syslog_handler = handlers.OSSysLogHandler()

10
requirements.txt
View File

@ -28,20 +28,20 @@ stevedore>=1.20.0 # Apache-2.0
oslo.cache>=1.26.0 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0 oslo.context>=2.20.0 # Apache-2.0
oslo.db>=4.37.0 # Apache-2.0 oslo.db>=4.37.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0 oslo.i18n>=3.20.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0 oslo.log>=4.1.2 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0 oslo.messaging>=5.29.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0
oslo.privsep>=1.32.0 # Apache-2.0 oslo.privsep>=1.32.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0 oslo.rootwrap>=5.8.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.upgradecheck>=0.1.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.36.0 # Apache-2.0
oslo.versionedobjects>=1.35.1 # Apache-2.0 oslo.versionedobjects>=1.35.1 # Apache-2.0
osprofiler>=2.3.0 # Apache-2.0 osprofiler>=2.3.0 # Apache-2.0
os-ken >= 0.3.0 # Apache-2.0 os-ken >= 0.3.0 # Apache-2.0

3
zuul.d/tempest-singlenode.yaml
View File

@ -188,6 +188,9 @@
((^neutron_tempest_plugin.api)|\ ((^neutron_tempest_plugin.api)|\
(^neutron_tempest_plugin.scenario)|\ (^neutron_tempest_plugin.scenario)|\
(tempest.(api|scenario|thirdparty))).*$" (tempest.(api|scenario|thirdparty))).*$"
# TODO(haleyb): Remove this blacklist when
# https://bugs.launchpad.net/neutron/+bug/1881558 is fixed.
tempest_black_regex: "(?:neutron_tempest_plugin.scenario.test_ipv6.IPv6Test)"
tempest_concurrency: 4 tempest_concurrency: 4
devstack_local_conf: devstack_local_conf:
test-config: test-config: