[openstack-tripleo-heat-templates] Allow setting Neutron tunnel type in no mergepy

[Ben Nemec]

commit 998d844782959012d82fa76a99fe7bce14ce0865
Author: Ben Nemec <bnemec at redhat.com>
Date:   Tue Jan 6 15:28:48 2015 -0600

    Allow setting Neutron tunnel type in no mergepy

 ...setting-Neutron-tunnel-type-in-no-mergepy.patch |   30 ++++++++++++++++++++
 openstack-tripleo-heat-templates.spec              |    7 ++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0006-Allow-setting-Neutron-tunnel-type-in-no-mergepy.patch b/0006-Allow-setting-Neutron-tunnel-type-in-no-mergepy.patch
new file mode 100644
index 0000000..ccc2480
--- /dev/null
+++ b/0006-Allow-setting-Neutron-tunnel-type-in-no-mergepy.patch
@@ -0,0 +1,30 @@
+From 197b45026511715d601d28b16c8423d341f583a2 Mon Sep 17 00:00:00 2001
+From: Ben Nemec <bnemec at redhat.com>
+Date: Mon, 5 Jan 2015 17:32:57 -0600
+Subject: [PATCH] Allow setting Neutron tunnel type in no mergepy
+
+The Neutron tunnel type settings were missing from the Controller
+section of the without-mergepy template, which made it impossible
+to configure any tunnel other than gre.
+
+Change-Id: Ia2579ed39a16d2b9826ce8406cb97fc116e3d595
+
+Conflicts:
+	overcloud-without-mergepy.yaml
+---
+ overcloud-without-mergepy.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
+index 505c2cc..c12edf7 100644
+--- a/overcloud-without-mergepy.yaml
++++ b/overcloud-without-mergepy.yaml
+@@ -468,6 +468,8 @@ resources:
+           NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
+           NeutronPassword: {get_param: NeutronPassword}
+           NeutronDnsmasqOptions: {get_param: NeutronDnsmasqOptions}
++          NeutronNetworkType: {get_param: NeutronNetworkType}
++          NeutronTunnelTypes: {get_param: NeutronTunnelTypes}
+           NovaPassword: {get_param: NovaPassword}
+           NtpServer: {get_param: NtpServer}
+           PublicVirtualInterface: {get_param: PublicVirtualInterface}
diff --git a/openstack-tripleo-heat-templates.spec b/openstack-tripleo-heat-templates.spec
index 9e341cb..d629cd5 100644
--- a/openstack-tripleo-heat-templates.spec
+++ b/openstack-tripleo-heat-templates.spec
@@ -1,7 +1,7 @@
 Name:		openstack-tripleo-heat-templates
 Summary:	Heat templates for TripleO
 Version:	0.7.9
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -12,6 +12,7 @@ Patch0002: 0002-Add-converted-version-of-block-and-object-storage.patch
 Patch0003: 0003-Align-the-cinder-storage.yaml-template-with-block-st.patch
 Patch0004: 0004-Remove-missing-cinder-storage-Neutron-parameters.patch
 Patch0005: 0005-Don-t-replace-OS-Neutron-Port-on-update.patch
+Patch0006: 0006-Allow-setting-Neutron-tunnel-type-in-no-mergepy.patch
 
 BuildArch:	noarch
 BuildRequires:	python2-devel
@@ -33,6 +34,7 @@ building Heat Templates to do deployments of OpenStack.
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
+%patch0006 -p1
 
 %build
 %{__python2} setup.py build
@@ -50,6 +52,9 @@ cp -ar *.yaml %{buildroot}/%{_datadir}/%{name}
 %{_bindir}/tripleo-heat-merge
 
 %changelog
+* Tue Jan 06 2015 Ben Nemec <bnemec at redhat.com> 0.7.9-9
+- Allow setting Neutron tunnel type in no mergepy
+
 * Mon Dec 15 2014 James Slagle <jslagle at redhat.com> 0.7.9-8
 - Don't replace OS::Neutron::Port on update