-diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a125.g4b15f10/etc/neutron.conf
---- neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf 2013-07-31 16:46:21.000000000 +0000
-+++ neutron-2013.2.a125.g4b15f10/etc/neutron.conf 2013-07-31 18:57:31.867679844 +0000
+Description: Fixes to neutron configuration for distribution.
+ Patch various bits of config to be more suitable for packaging.
+Author: James Page <james.page@ubuntu.com>
+Forwarded: not-needed
+
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
@@ -7,7 +7,7 @@
# Where to store Neutron state files. This directory must be writable by the
# Where to store lock files
lock_path = $state_path/lock
-@@ -45,7 +45,7 @@ bind_port = 9696
- # api_extensions_path =
-
- # Neutron plugin provider module
+@@ -50,7 +50,7 @@ lock_path = $state_path/lock
+ # previous versions, the class name of a plugin can be specified instead of its
+ # entrypoint name.
+ #
-# core_plugin =
-+core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
++core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
+ # Example: core_plugin = ml2
- # Advanced service modules
- # service_plugins =
-@@ -294,7 +294,7 @@ notification_topics = notifications
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -380,7 +380,7 @@ notification_driver = neutron.openstack.
# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
# =========== items for agent management extension =============
- # seconds between nodes reporting state to server, should be less than
-@@ -324,7 +324,7 @@ signing_dir = $state_path/keystone-signi
+ # seconds between nodes reporting state to server; should be less than
+@@ -404,7 +404,7 @@ signing_dir = $state_path/keystone-signi
# connection = mysql://root:pass@127.0.0.1:3306/neutron
# Replace 127.0.0.1 above with the IP address of the database used by the
# main neutron server. (Leave it as is if the database runs on this host.)