openstack
/
neutron
Code Issues Proposed changes

Merge "ovn: Do not set reside-on-redirect-chassis on distributed FIP" into stable/ussuri

This commit is contained in:
Zuul 2021-05-07 11:59:09 +00:00 committed by Gerrit Code Review
parent 6397ad1505 2611e10a1e
commit 54b9869c10
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
View File

@ -1357,7 +1357,8 @@ class OVNClient(object):
# logical router port is centralized in the chassis hosting the # logical router port is centralized in the chassis hosting the
# distributed gateway port. # distributed gateway port.
# https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996 # https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996
if network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN: if (network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN and
not ovn_conf.is_ovn_distributed_floating_ip()):
options['reside-on-redirect-chassis'] = 'true' options['reside-on-redirect-chassis'] = 'true'
is_gw_port = const.DEVICE_OWNER_ROUTER_GW == port.get( is_gw_port = const.DEVICE_OWNER_ROUTER_GW == port.get(