1 Description: Fixes to neutron configuration for distribution.
2 Patch various bits of config to be more suitable for packaging.
3 Author: James Page <james.page@ubuntu.com>
6 diff --git a/etc/neutron.conf b/etc/neutron.conf
7 index 1e2226f..a5fe086 100644
12 # Where to store Neutron state files. This directory must be writable by the
13 # user executing the agent.
14 -# state_path = /var/lib/neutron
15 +state_path = /var/lib/neutron
17 # Where to store lock files
18 lock_path = $state_path/lock
19 @@ -50,7 +50,7 @@ lock_path = $state_path/lock
20 # previous versions, the class name of a plugin can be specified instead of its
24 +core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
25 # Example: core_plugin = ml2
27 # (ListOpt) List of service plugin entrypoints to be loaded from the
28 @@ -320,7 +320,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
29 # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
30 # root filter facility.
31 # Change to "sudo" to skip the filtering and just run the comand directly
33 +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
35 # =========== items for agent management extension =============
36 # seconds between nodes reporting state to server; should be less than
37 @@ -344,7 +344,7 @@ signing_dir = $state_path/keystone-signing
38 # connection = mysql://root:pass@127.0.0.1:3306/neutron
39 # Replace 127.0.0.1 above with the IP address of the database used by the
40 # main neutron server. (Leave it as is if the database runs on this host.)
41 -# connection = sqlite://
42 +connection = sqlite:////var/lib/neutron/neutron.sqlite
44 # The SQLAlchemy connection string used to connect to the slave database