diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-15 19:04:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-15 19:04:19 +0000 |
| commit | dca894b410d63c67ab6e3ee2814a985a43274b82 (patch) | |
| tree | cf6629bb9a2b7e9c6d362ecd96b47e7f01cfebf4 /deprecated | |
| parent | c26dc7ea86adea9e157415aa8792d25948d85063 (diff) | |
| parent | 9100016c4ea19f23a58ee526b12880c4da3812ac (diff) | |
Merge "switch to vxlan by default"
Diffstat (limited to 'deprecated')
| -rw-r--r-- | deprecated/nova-compute-instance.yaml | 4 | ||||
| -rw-r--r-- | deprecated/overcloud-source.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deprecated/nova-compute-instance.yaml b/deprecated/nova-compute-instance.yaml index e68c61f9..811c0fc3 100644 --- a/deprecated/nova-compute-instance.yaml +++ b/deprecated/nova-compute-instance.yaml @@ -100,7 +100,7 @@ parameters: NeutronHost: type: string NeutronNetworkType: - default: 'gre' + default: 'vxlan' description: The tenant network type for Neutron, either gre or vxlan. type: string NeutronNetworkVLANRanges: @@ -114,7 +114,7 @@ parameters: description: A port to add to the NeutronPhysicalBridge. type: string NeutronTunnelTypes: - default: 'gre' + default: 'vxlan' description: | The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' diff --git a/deprecated/overcloud-source.yaml b/deprecated/overcloud-source.yaml index d355c4df..0729b338 100644 --- a/deprecated/overcloud-source.yaml +++ b/deprecated/overcloud-source.yaml @@ -221,7 +221,7 @@ parameters: If set, flat networks to configure in neutron plugins. Defaults to 'datacentre' to permit external network creation. NeutronNetworkType: - default: 'gre' + default: 'vxlan' description: The tenant network type for Neutron, either gre or vxlan. type: string NeutronNetworkVLANRanges: @@ -279,7 +279,7 @@ parameters: description: Shared secret to prevent spoofing type: string NeutronTunnelTypes: - default: 'gre' + default: 'vxlan' description: | The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' |