diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-12-05 10:44:29 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-12-05 20:48:33 -0500 |
| commit | 56c905774f37be86cf740e772fe3fb8d5e4719c1 (patch) | |
| tree | 84a18371bdd3380a4132dc536de6831d040c899f /overcloud-source.yaml | |
| parent | 9f7ccef25e7f8dde0b630a817d6acf780bc07a0a (diff) | |
Remove duplicate Neutron params in overcloud
In I422c65e7d941593083d52ad7fdf0dfd1d2fb3155
(Enable Neutron DVR support in TripleO installation)
we added duplicate parameters for NeutronPublicInterfaceRawDevice
and NeutronNetworkType.
In preparation for syncing with overcloud-without-mergepy.yaml
lets remove these dups.
Change-Id: Ib4888bc91f30aeb3aba590b69e4919a93f577143
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index a3252571..914f1872 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -259,10 +259,6 @@ parameters: overcloud.yaml to include the deployment of VLAN ports to the control plane. type: string - NeutronPublicInterfaceRawDevice: - default: '' - description: If set, the public interface is a vlan with this device as the raw device. - type: string NeutronComputeAgentMode: default: 'dvr' description: Agent mode for the neutron-l3-agent on the compute hosts @@ -279,10 +275,6 @@ parameters: default: 'unset' description: Shared secret to prevent spoofing type: string - NeutronNetworkType: - default: 'gre' - description: The tenant network type for Neutron, either gre or vxlan. - type: string NeutronTunnelTypes: default: 'gre' description: | |