Merge "Neutron; fix paths for l2' and arp'"

This commit is contained in:
Jenkins 2017-05-31 03:09:40 +00:00 committed by Gerrit Code Review
commit c846259675

View File

@ -298,8 +298,6 @@ conf:
neutron: neutron:
agent: agent:
root_helper: sudo /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper: sudo /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
l2_population: True
arp_responder: True
oslo_messaging_notifications: oslo_messaging_notifications:
oslo: oslo:
messaging: messaging:
@ -390,6 +388,8 @@ conf:
ovs: ovs:
agent: agent:
tunnel_types: vxlan tunnel_types: vxlan
l2_population: True
arp_responder: True
ovs: ovs:
neutron: neutron:
ml2: ml2: