Merge "Neutron: Correct section name for linuxbridge bridge_mappings config"

This commit is contained in:
Zuul 2017-11-14 15:56:17 +00:00 committed by Gerrit Code Review
commit b5fbda142c

View File

@ -1011,7 +1011,7 @@ conf:
securitygroup:
firewall_driver: openvswitch
linuxbridge_agent:
agent:
linux_bridge:
# To define Flat and VLAN connections, in LB we can assign
# specific interface to the flat/vlan network name using:
# physical_interface_mappings: "external:eth3"
@ -1019,7 +1019,7 @@ conf:
bridge_mappings: "external:br-ex"
# The two above options are exclusive, do not use both of them at once
securitygroup:
firewall_driver: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
firewall_driver: iptables
vxlan:
l2_population: True
arp_responder: True