Refreshed patches.

Change-Id: I22fc6c09e64cae9af11340f416f898abf4741b80

diff --git a/debian/patches/better-config-default.patch b/debian/patches/better-config-default.patch
index cb8618ca1e5df15b13ee0a9c7a4824f3fac118f2..51a4d7cab1fe47aa6474bfc1897cbd0a7a412d1e 100644 (file)
--- a/debian/patches/better-config-default.patch
+++ b/debian/patches/better-config-default.patch
@@ -5,8 +5,8 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
 Last-Update: 2013-12-09
 
---- neutron-2014.1~b1.orig/etc/l3_agent.ini
-+++ neutron-2014.1~b1/etc/l3_agent.ini
+--- neutron-2014.1~b2.orig/etc/l3_agent.ini
++++ neutron-2014.1~b2/etc/l3_agent.ini
 @@ -4,11 +4,9 @@
  
  # L3 requires that an interface driver be set. Choose the one that best
@@ -20,22 +20,29 @@ Last-Update: 2013-12-09
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2014.1~b1.orig/etc/neutron.conf
-+++ neutron-2014.1~b1/etc/neutron.conf
-@@ -45,10 +45,10 @@ lock_path = $state_path/lock
- # api_extensions_path =
- 
- # Neutron plugin provider module
+--- neutron-2014.1~b2.orig/etc/neutron.conf
++++ neutron-2014.1~b2/etc/neutron.conf
+@@ -50,8 +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 =
+-# Example: core_plugin = ml2
 +core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
  
- # Advanced service modules
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+ # neutron.service_plugins namespace. See setup.cfg for the entrypoint names of
+@@ -59,8 +58,8 @@ lock_path = $state_path/lock
+ # with previous versions, the class name of a plugin can be specified instead
+ # of its entrypoint name.
+ #
 -# service_plugins =
-+service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
+ # Example: service_plugins = router,firewall,lbaas,vpnaas,metering
++service_plugins = router,firewall,metering
  
  # Paste configuration file
  # api_paste_config = api-paste.ini
-@@ -119,16 +119,16 @@ lock_path = $state_path/lock
+@@ -131,16 +130,16 @@ lock_path = $state_path/lock
  # SSL certification authority file (valid only if SSL enabled)'
  # kombu_ssl_ca_certs =
  # IP address of the RabbitMQ installation
@@ -55,7 +62,7 @@ Last-Update: 2013-12-09
  # Location of a virtual RabbitMQ installation.
  # rabbit_virtual_host = /
  # Maximum retries with trying to connect to RabbitMQ
-@@ -299,7 +299,7 @@ notification_driver = neutron.openstack.
+@@ -320,7 +319,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
@@ -64,7 +71,7 @@ Last-Update: 2013-12-09
  
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server; should be less than
-@@ -319,11 +319,10 @@ signing_dir = $state_path/keystone-signi
+@@ -340,11 +339,10 @@ signing_dir = $state_path/keystone-signi
  
  [database]
  # This line MUST be changed to actually run the plugin.
@@ -78,8 +85,8 @@ Last-Update: 2013-12-09
  
  # The SQLAlchemy connection string used to connect to the slave database
  # slave_connection =
---- neutron-2014.1~b1.orig/etc/lbaas_agent.ini
-+++ neutron-2014.1~b1/etc/lbaas_agent.ini
+--- neutron-2014.1~b2.orig/etc/lbaas_agent.ini
++++ neutron-2014.1~b2/etc/lbaas_agent.ini
 @@ -9,11 +9,10 @@
  
  # LBaas requires an interface driver be set. Choose the one that best
@@ -93,8 +100,8 @@ Last-Update: 2013-12-09
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2014.1~b1.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-+++ neutron-2014.1~b1/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+--- neutron-2014.1~b2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
++++ neutron-2014.1~b2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
 @@ -30,7 +30,7 @@
  #          point setting tunnel_type below will be required to enable
  #          tunneling.
@@ -123,11 +130,10 @@ Last-Update: 2013-12-09
  
  # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
  # mapping physical network names to the agent's node-specific OVS
-@@ -130,24 +130,4 @@
- 
+@@ -131,35 +131,4 @@
  [securitygroup]
  # Firewall driver for realizing neutron security group function.
--# firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+ # firewall_driver = neutron.agent.firewall.NoopFirewallDriver
 -# Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 -
 -#-----------------------------------------------------------------------------
@@ -141,11 +147,23 @@ Last-Update: 2013-12-09
 -# integration_bridge = br-int
 -# bridge_mappings = default:br-eth1
 -#
--# 2. With tunneling.
+-# 2. With GRE tunneling.
+-# [OVS]
+-# network_vlan_ranges =
+-# tunnel_id_ranges = 1:1000
+-# integration_bridge = br-int
+-# tunnel_bridge = br-tun
+-# local_ip = 10.0.0.3
+-#
+-# 3. With VXLAN tunneling.
 -# [OVS]
 -# network_vlan_ranges =
+-# tenant_network_type = vxlan
+-# tunnel_type = vxlan
 -# tunnel_id_ranges = 1:1000
 -# integration_bridge = br-int
 -# tunnel_bridge = br-tun
 -# local_ip = 10.0.0.3
+-# [AGENT]
+-# tunnel_types = vxlan
 +firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver