From 1c13fb03d1d9040014f6927be43a9ddcabcb7f5a Mon Sep 17 00:00:00 2001
From: Brian Haley <haleyb.dev@gmail.com>
Date: Mon, 20 Nov 2023 13:28:03 -0500
Subject: [PATCH] Remove ovs_integration_bridge configuration option
This option has been marked deprecated since Ussuri
as it is a duplicate of OVS:integration_bridge, let's
remove it.
TrivialFix
Change-Id: I81bc5f3d98f752d926a243cbd17b8b894f2bdf58
---
neutron/conf/agent/common.py | 6 ------
neutron/conf/plugins/ml2/drivers/ovs_conf.py | 1 -
.../remove-ovs_integration_bridge-583b8c395f6ba64e.yaml | 6 ++++++
3 files changed, 6 insertions(+), 7 deletions(-)
create mode 100644 releasenotes/notes/remove-ovs_integration_bridge-583b8c395f6ba64e.yaml
diff --git a/neutron/conf/agent/common.py b/neutron/conf/agent/common.py
index f05e57bcd17..a3aa59c614f 100644
--- a/neutron/conf/agent/common.py
+++ b/neutron/conf/agent/common.py
@@ -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. "
diff --git a/neutron/conf/plugins/ml2/drivers/ovs_conf.py b/neutron/conf/plugins/ml2/drivers/ovs_conf.py
index e895e0098b5..ac864763e49 100644
--- a/neutron/conf/plugins/ml2/drivers/ovs_conf.py
+++ b/neutron/conf/plugins/ml2/drivers/ovs_conf.py
@@ -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 "
diff --git a/releasenotes/notes/remove-ovs_integration_bridge-583b8c395f6ba64e.yaml b/releasenotes/notes/remove-ovs_integration_bridge-583b8c395f6ba64e.yaml
new file mode 100644
index 00000000000..5018e2ead19
--- /dev/null
+++ b/releasenotes/notes/remove-ovs_integration_bridge-583b8c395f6ba64e.yaml
@@ -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``.