Build from master with 2014.2.b2

[openstack-build/neutron-build.git] / debian / patches / fix-quantum-configuration.patch

diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch
index df77dbe6cc269500c0230cea371012d4e0ecb183..4b4780b7f6bb4f90449f3b8e6441054c37387021 100644 (file)
--- a/debian/patches/fix-quantum-configuration.patch
+++ b/debian/patches/fix-quantum-configuration.patch
@@ -1,38 +1,37 @@
 --- 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
  # user executing the agent.
 -# state_path = /var/lib/neutron
 +state_path = /var/lib/neutron
- 
+
  # Where to store lock files
  lock_path = $state_path/lock
-@@ -45,7 +45,7 @@ lock_path = $state_path/lock
- # api_extensions_path =
- 
- # Neutron plugin provider module
+@@ -50,7 +50,7 @@
+ # 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
- 
- # Advanced service modules
- # service_plugins =
-@@ -295,7 +295,7 @@ notification_driver = neutron.openstack.
- # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
+ # Example: core_plugin = ml2
+
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -490,6 +490,7 @@
  # root filter facility.
  # Change to "sudo" to skip the filtering and just run the comand directly
--# root_helper = sudo
+ # root_helper = sudo
 +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
-@@ -319,7 +319,7 @@ signing_dir = $state_path/keystone-signi
+@@ -512,7 +513,7 @@
  # 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.)
 -# connection = sqlite://
 +connection = sqlite:////var/lib/neutron/neutron.sqlite
- 
- # The SQLAlchemy connection string used to connect to the slave database
- # slave_connection =
+ # NOTE: In deployment the [database] section and its connection attribute may
+ # be set in the corresponding core plugin '.ini' file. However, it is suggested
+ # to put the [database] section and its connection attribute in this