openstack
/
neutron
Code Issues Proposed changes

Merge "Remove ovs_integration_bridge configuration option"

This commit is contained in:
Zuul 2023-12-01 18:20:23 +00:00 committed by Gerrit Code Review
parent 6b362ed5bf 1c13fb03d1
commit 420ad91bcb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/conf/agent/common.py
View File

@ -48,12 +48,6 @@ PD_DRIVER_OPTS = [
INTERFACE_OPTS = [
cfg.StrOpt('ovs_integration_bridge',
default='br-int',
deprecated_for_removal=True,
deprecated_reason='This variable is a duplicate of '
'OVS.integration_bridge. To be removed in W.',
help=_('Name of Open vSwitch bridge to use')),
cfg.BoolOpt('ovs_use_veth',
default=False,
help=_("Uses veth for an OVS interface or not. "

1
neutron/conf/plugins/ml2/drivers/ovs_conf.py
View File

@ -26,7 +26,6 @@ DEFAULT_TUNNEL_TYPES = []
ovs_opts = [
cfg.StrOpt('integration_bridge', default='br-int',
deprecated_name='ovs_integration_bridge',
help=_("Integration bridge to use. "
"Do not change this parameter unless you have a good "
"reason to. This is the name of the OVS integration "

6
releasenotes/notes/remove-ovs_integration_bridge-583b8c395f6ba64e.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Remove ``[DEFAULT] ovs_integration_bridge`` configuration option,
which was deprecated in the 'Ussuri' release, as it was a duplicate of
``[OVS] integration_bridge``.