From 99ace1934981a585966596fa0969a3dbc60db0b5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 23 Oct 2014 15:28:05 +0800 Subject: [PATCH] Patches the ml2 plugin ini file to be like the install-guide by default. --- debian/changelog | 6 +++ debian/patches/series | 1 + debian/patches/working-ml2-defaults.patch | 61 +++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 debian/patches/working-ml2-defaults.patch diff --git a/debian/changelog b/debian/changelog index 4dc6b8025..2198b7e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +neutron (2014.2-3) experimental; urgency=medium + + * Patches the ml2 plugin ini file to be like the install-guide by default. + + -- Thomas Goirand Thu, 23 Oct 2014 14:59:07 +0800 + neutron (2014.2-2) experimental; urgency=medium * Removed arping from depends of python-neutron, and put iputils-arping as diff --git a/debian/patches/series b/debian/patches/series index 374e83f9a..baa341b20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch better-config-default.patch fix-alembic-migrations-with-sqlite.patch +working-ml2-defaults.patch diff --git a/debian/patches/working-ml2-defaults.patch b/debian/patches/working-ml2-defaults.patch new file mode 100644 index 000000000..a78c15b62 --- /dev/null +++ b/debian/patches/working-ml2-defaults.patch @@ -0,0 +1,61 @@ +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 +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 : 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 : 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 -- 2.45.2