Browse Source

Merge "Use local and ip address to create vxlan interface" into stable/ussuri

changes/79/795279/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
c78428a93c
2 changed files with 5 additions and 0 deletions
  1. +4
    -0
      neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
  2. +1
    -0
      neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py

+ 4
- 0
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py View File

@ -347,8 +347,12 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
if self.vxlan_mode == lconst.VXLAN_MCAST:
args['group'] = self.get_vxlan_group(segmentation_id)
if cfg.CONF.VXLAN.l2_population:
args['proxy'] = cfg.CONF.VXLAN.arp_responder
# L2population should set the local ip address to handle
# a source dev with multiple ip addresses configured.
args['local'] = self.local_ip
try:
int_vxlan = self.ip.add_vxlan(interface, segmentation_id,


+ 1
- 0
neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py View File

@ -412,6 +412,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
dstport=None,
ttl=None,
dev=self.lbm.local_int,
local=self.lbm.local_ip,
proxy=expected_proxy)
def test_ensure_vxlan_arp_responder_enabled(self):


Loading…
Cancel
Save