* Added sane-defaults-for-ml2_conf.ini.patch

* Fixed debian/changelog

Change-Id: I70ad50cae04ebfd52c4f4a0f2f84e6091a40d309

Rewritten-From: b220d41d6724a85b0b756a2bd2ebb1e410bed4b6

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index c30edf0aac58f59d57bcc392c26870e6d1b2b5e8..fc9ee4c67c6865adf24ab22bcf0da1ad48629135 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,9 +1,15 @@
+neutron (2014.1-8) unstable; urgency=medium
+
+  * Added sane-defaults-for-ml2_conf.ini.patch.
+  * Added missing dbconfig-common dependency.
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 07 Jun 2014 17:27:55 +0800
+
 neutron (2014.1-7) unstable; urgency=medium
 
   * Updates the OVS_lib_defer_apply_doesn_t_handle_concurrency.patch patch
     (Closes: #750415).
   * Now build-depends on openstack-pkg-tools (>= 12~).
-  * Added missing dbconfig-common dependency.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 05 Jun 2014 07:25:38 +0000
 

diff --git a/trusty/debian/patches/sane-defaults-for-ml2_conf.ini.patch b/trusty/debian/patches/sane-defaults-for-ml2_conf.ini.patch
new file mode 100644 (file)
index 0000000..16d914e
--- /dev/null
+++ b/trusty/debian/patches/sane-defaults-for-ml2_conf.ini.patch
@@ -0,0 +1,46 @@
+Description: Sane defaults for the ML2 ml2_conf.ini
+ By default, it just doesn't work. This patch makes situation better.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2014-06-07
+
+--- neutron-2014.1.orig/etc/neutron/plugins/ml2/ml2_conf.ini
++++ neutron-2014.1/etc/neutron/plugins/ml2/ml2_conf.ini
+@@ -2,19 +2,19 @@
+ # (ListOpt) List of network type driver entrypoints to be loaded from
+ # the neutron.ml2.type_drivers namespace.
+ #
+-# type_drivers = local,flat,vlan,gre,vxlan
++type_drivers = gre
+ # Example: type_drivers = flat,vlan,gre,vxlan
+ 
+ # (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
++tenant_network_types = gre
+ # Example: tenant_network_types = vlan,gre,vxlan
+ 
+ # (ListOpt) Ordered list of networking mechanism driver entrypoints
+ # to be loaded from the neutron.ml2.mechanism_drivers namespace.
+-# mechanism_drivers =
++mechanism_drivers = openvswitch
+ # Example: mechanism drivers = openvswitch,mlnx
+ # Example: mechanism_drivers = arista
+ # Example: mechanism_drivers = cisco,logger
+@@ -41,7 +41,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
+@@ -59,4 +59,4 @@
+ [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

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 40d6ae75f8256a68ff0c1b18090ec7ef9d8b41bb..dbac7db6d9701a53544233f47a57b5f86f2ce608 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -5,3 +5,4 @@ OVS_lib_defer_apply_doesn_t_handle_concurrency.patch
 0004-Fix-Metering-doesn-t-respect-the-l3-agent-binding.patch
 Properly_apply_column_default_in_migration_pool_monitor_status.patch
 Install_SNAT_rules_for_ipv4_only.patch
+sane-defaults-for-ml2_conf.ini.patch