Removed old config patches.

Rewritten-From: c72d613f126f8944d3b48a77f807f7d892f90fd3

diff --git a/trusty/debian/patches/defaults-closer-to-install-guide.patch b/trusty/debian/patches/defaults-closer-to-install-guide.patch
deleted file mode 100644 (file)
index 3cc6c26..0000000
--- a/trusty/debian/patches/defaults-closer-to-install-guide.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Default closer to install-guide
- In order to simplify the install procedure in the install-guide, this patch
- makes defaults closer to what the guide is proposing, making the customization
- a lot more easy and fast.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-10-23
-
-Index: neutron/etc/l3_agent.ini
-===================================================================
---- neutron.orig/etc/l3_agent.ini      2015-02-09 20:14:20.000000000 +0100
-+++ neutron/etc/l3_agent.ini   2015-02-10 14:44:50.000000000 +0100
-@@ -20,7 +20,7 @@
- 
- # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
- # iproute2 package that supports namespaces).
--# use_namespaces = True
-+use_namespaces = True
- 
- # If use_namespaces is set as False then the agent can only configure one router.
- 
-@@ -43,7 +43,7 @@
- # Name of bridge used for external network traffic. This should be set to
- # empty value for the linux bridge. when this parameter is set, each L3 agent
- # can be associated with no more than one external network.
--# external_network_bridge = br-ex
-+external_network_bridge = br-ex
- 
- # TCP Port used by Neutron metadata server
- # metadata_port = 9697
-Index: neutron/etc/dhcp_agent.ini
-===================================================================
---- neutron.orig/etc/dhcp_agent.ini    2015-02-09 20:13:12.000000000 +0100
-+++ neutron/etc/dhcp_agent.ini 2015-02-10 14:44:50.000000000 +0100
-@@ -9,11 +9,10 @@
- 
- # The DHCP agent requires an interface driver be set. Choose the one that best
- # matches your plugin.
--# interface_driver =
--
-+# 
- # Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP,
- # BigSwitch/Floodlight)
--# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
-+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
- 
- # Name of Open vSwitch bridge to use
- # ovs_integration_bridge = br-int
-@@ -28,11 +27,11 @@
- 
- # The agent can use other DHCP drivers.  Dnsmasq is the simplest and requires
- # no additional setup of the DHCP server.
--# dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
-+dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
- 
- # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
- # iproute2 package that supports namespaces).
--# use_namespaces = True
-+use_namespaces = True
- 
- # The DHCP server can assist with providing metadata support on isolated
- # networks. Setting this value to True will cause the DHCP server to append

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index b504169f72f33ee2da5232c5e787c3b238620f82..3ee86a43fad37e088610020f2b1d1cd07bc5f78b 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1 @@
 fix-alembic-migrations-with-sqlite.patch
-working-ml2-defaults.patch
-defaults-closer-to-install-guide.patch

diff --git a/trusty/debian/patches/working-ml2-defaults.patch b/trusty/debian/patches/working-ml2-defaults.patch
deleted file mode 100644 (file)
index a78c15b..0000000
--- a/trusty/debian/patches/working-ml2-defaults.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Nicer ml2 plugin defaults
- This patch configures the ml2 plugin as described at:
- http://docs.openstack.org/juno/install-guide/install/apt-debian/content/neutron-controller-node.html
-Author: Thomas Goirand <zigo@debian.org>
-Origin: upstream, http://docs.openstack.org/juno/install-guide/install/apt-debian/content/neutron-controller-node.html
-Forwarded: not-needed
-Last-Update: 2014-10-23
-
---- neutron-2014.2~rc2.orig/etc/neutron/plugins/ml2/ml2_conf.ini
-+++ neutron-2014.2~rc2/etc/neutron/plugins/ml2/ml2_conf.ini
-@@ -2,24 +2,24 @@
- # (ListOpt) List of network type driver entrypoints to be loaded from
- # the neutron.ml2.type_drivers namespace.
- #
--# type_drivers = local,flat,vlan,gre,vxlan
--# Example: type_drivers = flat,vlan,gre,vxlan
-+# Example: type_drivers = local,flat,vlan,gre,vxlan
-+type_drivers = flat,gre
- 
- # (ListOpt) Ordered list of network_types to allocate as tenant
- # networks. The default value 'local' is useful for single-box testing
- # but provides no connectivity between hosts.
- #
--# tenant_network_types = local
- # Example: tenant_network_types = vlan,gre,vxlan
-+tenant_network_types = gre
- 
- # (ListOpt) Ordered list of networking mechanism driver entrypoints
- # to be loaded from the neutron.ml2.mechanism_drivers namespace.
--# mechanism_drivers =
- # Example: mechanism_drivers = openvswitch,mlnx
- # Example: mechanism_drivers = arista
- # Example: mechanism_drivers = cisco,logger
- # Example: mechanism_drivers = openvswitch,brocade
- # Example: mechanism_drivers = linuxbridge,brocade
-+mechanism_drivers = openvswitch
- 
- # (ListOpt) Ordered list of extension driver entrypoints
- # to be loaded from the neutron.ml2.extension_drivers namespace.
-@@ -46,7 +46,7 @@
- 
- [ml2_type_gre]
- # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation
--# tunnel_id_ranges =
-+tunnel_id_ranges = 1:1000
- 
- [ml2_type_vxlan]
- # (ListOpt) Comma-separated list of <vni_min>:<vni_max> tuples enumerating
-@@ -64,8 +64,10 @@
- [securitygroup]
- # Controls if neutron security group is enabled or not.
- # It should be false when you use nova security group.
--# enable_security_group = True
-+enable_security_group = True
- 
- # Use ipset to speed-up the iptables security groups. Enabling ipset support
- # requires that ipset is installed on L2 agent node.
--# enable_ipset = True
-+enable_ipset = True
-+
-+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver