From: Thomas Goirand <thomas@goirand.fr>
Date: Sun, 6 Oct 2013 06:15:54 +0000 (+0800)
Subject: Refreshed patch.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b42eb687ea3d337c04ab7f97af2247ce5a3bb586;p=openstack-build%2Fneutron-build.git

Refreshed patch.

Rewritten-From: b7246a008c414abaeb5bdd638f7871a2d0756864
---

diff --git a/trusty/debian/patches/better-config-default.patch b/trusty/debian/patches/better-config-default.patch
index a88c714f8..13851e361 100644
--- a/trusty/debian/patches/better-config-default.patch
+++ b/trusty/debian/patches/better-config-default.patch
@@ -5,8 +5,10 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
 Last-Update: 2013-09-26
 
---- neutron-2013.2~b3.orig/etc/l3_agent.ini
-+++ neutron-2013.2~b3/etc/l3_agent.ini
+Index: neutron/etc/l3_agent.ini
+===================================================================
+--- neutron.orig/etc/l3_agent.ini	2013-10-06 14:15:35.000000000 +0800
++++ neutron/etc/l3_agent.ini	2013-10-06 14:15:38.000000000 +0800
 @@ -8,7 +8,7 @@
  
  # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC)
@@ -16,9 +18,11 @@ Last-Update: 2013-09-26
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2013.2~b3.orig/etc/neutron.conf
-+++ neutron-2013.2~b3/etc/neutron.conf
-@@ -45,7 +45,7 @@ lock_path = $state_path/lock
+Index: neutron/etc/neutron.conf
+===================================================================
+--- neutron.orig/etc/neutron.conf	2013-10-06 14:15:35.000000000 +0800
++++ neutron/etc/neutron.conf	2013-10-06 14:15:38.000000000 +0800
+@@ -45,7 +45,7 @@
  # api_extensions_path =
  
  # Neutron plugin provider module
@@ -27,7 +31,7 @@ Last-Update: 2013-09-26
  
  # Advanced service modules
  # service_plugins =
-@@ -119,16 +119,16 @@ lock_path = $state_path/lock
+@@ -119,16 +119,16 @@
  # SSL certification authority file (valid only if SSL enabled)'
  # kombu_ssl_ca_certs =
  # IP address of the RabbitMQ installation
@@ -47,7 +51,7 @@ Last-Update: 2013-09-26
  # Location of a virtual RabbitMQ installation.
  # rabbit_virtual_host = /
  # Maximum retries with trying to connect to RabbitMQ
-@@ -294,7 +294,7 @@ notification_driver = neutron.openstack.
+@@ -294,7 +294,7 @@
  # 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
@@ -56,7 +60,7 @@ Last-Update: 2013-09-26
  
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server, should be less than
-@@ -314,11 +314,10 @@ signing_dir = $state_path/keystone-signi
+@@ -314,11 +314,10 @@
  
  [database]
  # This line MUST be changed to actually run the plugin.
@@ -70,8 +74,10 @@ Last-Update: 2013-09-26
  
  # The SQLAlchemy connection string used to connect to the slave database
  # slave_connection =
---- neutron-2013.2~b3.orig/etc/lbaas_agent.ini
-+++ neutron-2013.2~b3/etc/lbaas_agent.ini
+Index: neutron/etc/lbaas_agent.ini
+===================================================================
+--- neutron.orig/etc/lbaas_agent.ini	2013-10-06 14:15:35.000000000 +0800
++++ neutron/etc/lbaas_agent.ini	2013-10-06 14:15:38.000000000 +0800
 @@ -13,7 +13,7 @@
  
  # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP,
@@ -81,8 +87,10 @@ Last-Update: 2013-09-26
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2013.2~b3.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-+++ neutron-2013.2~b3/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+Index: neutron/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+===================================================================
+--- neutron.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini	2013-10-06 14:15:35.000000000 +0800
++++ neutron/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini	2013-10-06 14:15:38.000000000 +0800
 @@ -30,7 +30,7 @@
  #          point setting tunnel_type below will be required to enable
  #          tunneling.
@@ -111,7 +119,7 @@ Last-Update: 2013-09-26
  
  # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
  # mapping physical network names to the agent's node-specific OVS
-@@ -117,28 +117,3 @@
+@@ -125,28 +125,3 @@
  # Firewall driver for realizing neutron security group function.
  # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
  # Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver