From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 5 Jan 2015 23:32:57 +0000 (-0600)
Subject: Allow setting Neutron tunnel type in no mergepy
X-Git-Tag: opnfv-6.0.0~2698^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e137dd54d371f5830162ba19cb6fdf018f12e6e7;p=apex-tripleo-heat-templates.git

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
---

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 803a5016..d07d6856 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -509,6 +509,8 @@ resources:
           NeutronAgentMode: {get_param: NeutronAgentMode}
           NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
           NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
+          NeutronNetworkType: {get_param: NeutronNetworkType}
+          NeutronTunnelTypes: {get_param: NeutronTunnelTypes}
           NovaPassword: {get_param: NovaPassword}
           NtpServer: {get_param: NtpServer}
           PublicVirtualInterface: {get_param: PublicVirtualInterface}