X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=blobdiff_plain;f=debian%2Fpatches%2Ffix-quantum-configuration.patch;fp=debian%2Fpatches%2Ffix-quantum-configuration.patch;h=4d7ef439a677a76d066bbacf0a4bd09cc4338dfa;hp=df77dbe6cc269500c0230cea371012d4e0ecb183;hb=3dea7869947d652cb9d069c3b9fcbd3f4c32ec3b;hpb=8127ea1ce21fe5cfdc9a394af5e8f03620884c18

diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch
index df77dbe6c..4d7ef439a 100644
--- a/debian/patches/fix-quantum-configuration.patch
+++ b/debian/patches/fix-quantum-configuration.patch
@@ -1,3 +1,10 @@
+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
+
+diff --git a/etc/neutron.conf b/etc/neutron.conf
+index 1e2226f..a5fe086 100644
 --- a/etc/neutron.conf
 +++ b/etc/neutron.conf
 @@ -7,7 +7,7 @@
@@ -9,16 +16,16 @@
  
  # 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 @@ 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 =
-@@ -295,7 +295,7 @@ notification_driver = neutron.openstack.
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -320,7 +320,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
  # 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
@@ -27,7 +34,7 @@
  
  # =========== 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
+@@ -344,7 +344,7 @@ signing_dir = $state_path/keystone-signing
  # 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.)
@@ -36,3 +43,6 @@
  
  # The SQLAlchemy connection string used to connect to the slave database
  # slave_connection =
+-- 
+1.8.5.2
+