Merged next in

This commit is contained in:
Liam Young 2015-03-24 17:08:24 +00:00
commit 066040cfde

View File

@ -11,6 +11,8 @@ core_plugin = {{ core_plugin }}
control_exchange = neutron control_exchange = neutron
notification_driver = neutron.openstack.common.notifier.list_notifier notification_driver = neutron.openstack.common.notifier.list_notifier
list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
{% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }} network_device_mtu = {{ network_device_mtu }}
{% endif -%}
[agent] [agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf