Browse Source

Merge "Do not block connection between br-int and br-phys on startup" into stable/queens

changes/69/739669/2
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
117e25345b
1 changed files with 10 additions and 3 deletions
  1. +10
    -3
      neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py

+ 10
- 3
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py View File

@@ -1275,9 +1275,16 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
self.int_ofports[physical_network] = int_ofport
self.phys_ofports[physical_network] = phys_ofport

# block all untranslated traffic between bridges
self.int_br.drop_port(in_port=int_ofport)
br.drop_port(in_port=phys_ofport)
# following drop operations are not necessary for
# dvr agent setup_dvr_flows. So skip it if dvr enabled
# the reason is for br_int it is duplicate
# for br_physical drop_port is dangerous because when dvr
# enabled the highest flow on table=0 is 2 which means
# basically everything will be dropped until setup_dvr_flows
# got executed.
if not self.enable_distributed_routing:
self.int_br.drop_port(in_port=int_ofport)
br.drop_port(in_port=phys_ofport)

if self.use_veth_interconnection:
# enable veth to pass traffic


Loading…
Cancel
Save