aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-15 19:04:19 +0000
committerGerrit Code Review <review@openstack.org>2015-09-15 19:04:19 +0000
commitdca894b410d63c67ab6e3ee2814a985a43274b82 (patch)
treecf6629bb9a2b7e9c6d362ecd96b47e7f01cfebf4 /overcloud-without-mergepy.yaml
parentc26dc7ea86adea9e157415aa8792d25948d85063 (diff)
parent9100016c4ea19f23a58ee526b12880c4da3812ac (diff)
Merge "switch to vxlan by default"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r--overcloud-without-mergepy.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 02f36cc..63cce2a 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -116,7 +116,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
NeutronPassword:
@@ -155,7 +155,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'