X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Ffix-quantum-configuration.patch;h=df77dbe6cc269500c0230cea371012d4e0ecb183;hb=refs%2Fheads%2Fopenstack-ci%2Fbuild%2Fhavana;hp=a23b9dfe2202c640aedcf4aa50deb96c008f3719;hpb=b8c751c0e66c4006e2ab2068726acb8cfa62a030;p=openstack-build%2Fneutron-build.git

diff --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch
index a23b9dfe2..df77dbe6c 100644
--- a/debian/patches/fix-quantum-configuration.patch
+++ b/debian/patches/fix-quantum-configuration.patch
@@ -1,6 +1,5 @@
-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
+--- 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
@@ -10,7 +9,7 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1
  
  # Where to store lock files
  lock_path = $state_path/lock
-@@ -45,7 +45,7 @@ bind_port = 9696
+@@ -45,7 +45,7 @@ lock_path = $state_path/lock
  # api_extensions_path =
  
  # Neutron plugin provider module
@@ -19,7 +18,7 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1
  
  # Advanced service modules
  # service_plugins =
-@@ -294,7 +294,7 @@ notification_topics = notifications
+@@ -295,7 +295,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
@@ -27,8 +26,8 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1
 +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
+@@ -319,7 +319,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.)