1 diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a125.g4b15f10/etc/neutron.conf
2 --- neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf 2013-07-31 16:46:21.000000000 +0000
3 +++ neutron-2013.2.a125.g4b15f10/etc/neutron.conf 2013-07-31 18:57:31.867679844 +0000
6 # Where to store Neutron state files. This directory must be writable by the
7 # user executing the agent.
8 -# state_path = /var/lib/neutron
9 +state_path = /var/lib/neutron
11 # Where to store lock files
12 lock_path = $state_path/lock
13 @@ -45,7 +45,7 @@ bind_port = 9696
14 # api_extensions_path =
16 # Neutron plugin provider module
18 +core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
20 # Advanced service modules
22 @@ -294,7 +294,7 @@ notification_topics = notifications
23 # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
24 # root filter facility.
25 # Change to "sudo" to skip the filtering and just run the comand directly
27 +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
29 # =========== items for agent management extension =============
30 # seconds between nodes reporting state to server, should be less than
31 @@ -324,7 +324,7 @@ signing_dir = $state_path/keystone-signi
32 # connection = mysql://root:pass@127.0.0.1:3306/neutron
33 # Replace 127.0.0.1 above with the IP address of the database used by the
34 # main neutron server. (Leave it as is if the database runs on this host.)
35 -# connection = sqlite://
36 +connection = sqlite:////var/lib/neutron/neutron.sqlite
38 # The SQLAlchemy connection string used to connect to the slave database