Skip to content

Commit dfd6696

Browse files
committed
Fix setting correct 'reside-on-chassis-redirect' in the maintenance task
Setting of the 'reside-on-chassis-redirect' was skipped for LRP ports of the provider tenant networks in patch [1] but later patch [2] removed this limitation from the ovn_client but not from the maintenance task. Due to that this option wasn't updated after e.g. change of the 'enable_distributed_floating_ip' config option and connectivity to the existing Floating IPs associated to the ports in vlan tenant networks was broken. This patch removes that limitation and this option is now updated for all of the Logical_Router_Ports for vlan networks, not only for external gateways. [1] https://review.opendev.org/c/openstack/neutron/+/871252 [2] https://review.opendev.org/c/openstack/neutron/+/878450 Conflicts: neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py Closes-bug: #2073987 Change-Id: I56e791847c8f4f3a07f543689bf22fde8160c9b7 (cherry picked from commit 4b1bfb9)
1 parent 5072af6 commit dfd6696

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,10 +772,7 @@ def check_vlan_distributed_ports(self):
772772
# Get router ports belonging to VLAN networks
773773
vlan_nets = self._ovn_client._plugin.get_networks(
774774
context, {pnet.NETWORK_TYPE: [n_const.TYPE_VLAN]})
775-
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
776-
# is_provider_network check should be removed
777-
vlan_net_ids = [vn['id'] for vn in vlan_nets
778-
if not utils.is_provider_network(vn)]
775+
vlan_net_ids = [vn['id'] for vn in vlan_nets]
779776
router_ports = self._ovn_client._plugin.get_ports(
780777
context, {'network_id': vlan_net_ids,
781778
'device_owner': n_const.ROUTER_PORT_OWNERS})

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,8 +1610,6 @@ def _gen_router_port_options(self, port, network=None):
16101610
# logical router port is centralized in the chassis hosting the
16111611
# distributed gateway port.
16121612
# https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996
1613-
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
1614-
# is_provider_network check should be removed
16151613
if network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN:
16161614
reside_redir_ch = self._get_reside_redir_for_gateway_port(
16171615
port['device_id'])

0 commit comments

Comments
 (0)