openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Ben Nemec 2015-01-05 17:32:57 -06:00
parent 733339df91
commit e137dd54d3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud-without-mergepy.yaml
View File

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