Merge "Fix setting correct 'reside-on-chassis-redirect' in the maintenance task" into stable/2024.1
This commit is contained in:
commit
0b6a96d744
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb
@ -719,10 +719,7 @@ class DBInconsistenciesPeriodics(SchemaAwarePeriodicsBase):
|
||||
# Get router ports belonging to VLAN networks
|
||||
vlan_nets = self._ovn_client._plugin.get_networks(
|
||||
context, {pnet.NETWORK_TYPE: [n_const.TYPE_VLAN]})
|
||||
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
|
||||
# is_provider_network check should be removed
|
||||
vlan_net_ids = [vn['id'] for vn in vlan_nets
|
||||
if not utils.is_provider_network(vn)]
|
||||
vlan_net_ids = [vn['id'] for vn in vlan_nets]
|
||||
router_ports = self._ovn_client._plugin.get_ports(
|
||||
context, {'network_id': vlan_net_ids,
|
||||
'device_owner': n_const.ROUTER_PORT_OWNERS})
|
||||
|
@ -1676,8 +1676,6 @@ class OVNClient(object):
|
||||
# logical router port is centralized in the chassis hosting the
|
||||
# distributed gateway port.
|
||||
# https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996
|
||||
# FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
|
||||
# is_provider_network check should be removed
|
||||
if network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN:
|
||||
reside_redir_ch = self._get_reside_redir_for_gateway_port(
|
||||
port['device_id'])
|
||||
|
Loading…
x
Reference in New Issue
Block a user