diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2015-01-05 17:32:57 -0600 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2015-01-05 17:32:57 -0600 |
| commit | e137dd54d371f5830162ba19cb6fdf018f12e6e7 (patch) | |
| tree | 5e2793402fc6171f4d9bc20d6a191c9e3812064c | |
| parent | 733339df912c2d8a488c2e823c83904febed8581 (diff) | |
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
| -rw-r--r-- | overcloud-without-mergepy.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
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} |