X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Ffix-neutron-configuration.patch;h=c306a40397cc4bcdff2356cb3943a360f48cc4da;hb=refs%2Fchanges%2F03%2F903%2F2;hp=25456d50ee43f92a3fc3359a2c7ad44a2e42ca87;hpb=bdc92022d63d3288882ce1b17332101def900ebf;p=openstack-build%2Fneutron-build.git

diff --git a/debian/patches/fix-neutron-configuration.patch b/debian/patches/fix-neutron-configuration.patch
index 25456d50e..c306a4039 100644
--- a/debian/patches/fix-neutron-configuration.patch
+++ b/debian/patches/fix-neutron-configuration.patch
@@ -1,8 +1,8 @@
 diff --git a/etc/neutron.conf b/etc/neutron.conf
-index 31977a8..62a0e14 100644
+index 0e61cf7..c5aca0f 100644
 --- a/etc/neutron.conf
 +++ b/etc/neutron.conf
-@@ -50,7 +50,7 @@ lock_path = $state_path/lock
+@@ -60,7 +60,7 @@ lock_path = $state_path/lock
  # previous versions, the class name of a plugin can be specified instead of its
  # entrypoint name.
  #
@@ -11,16 +11,16 @@ index 31977a8..62a0e14 100644
  # Example: core_plugin = ml2
  
  # (ListOpt) List of service plugin entrypoints to be loaded from the
-@@ -389,7 +389,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
+@@ -548,7 +548,7 @@ lock_path = $state_path/lock
  # 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
 -# 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
-@@ -412,7 +412,7 @@ admin_password = %SERVICE_PASSWORD%
+ # Set to true to add comments to generated iptables rules that describe
+ # each rule's purpose. (System must support the iptables comments module.)
+@@ -575,7 +575,7 @@ admin_password = %SERVICE_PASSWORD%
  # 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.)
@@ -29,6 +29,3 @@ index 31977a8..62a0e14 100644
  # 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
--- 
-2.0.0
-