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 /compute.yaml | |
parent | c26dc7ea86adea9e157415aa8792d25948d85063 (diff) | |
parent | 9100016c4ea19f23a58ee526b12880c4da3812ac (diff) |
Merge "switch to vxlan by default"
Diffstat (limited to 'compute.yaml')
-rw-r--r-- | compute.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compute.yaml b/compute.yaml index 169e9cf2..9a2c6f17 100644 --- a/compute.yaml +++ b/compute.yaml @@ -132,7 +132,7 @@ parameters: NeutronNetworkType: type: string description: The tenant network type for Neutron, either gre or vxlan. - default: 'gre' + default: 'vxlan' NeutronNetworkVLANRanges: default: 'datacentre' description: > @@ -158,7 +158,7 @@ parameters: description: | The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' - default: 'gre' + default: 'vxlan' NeutronTunnelIdRanges: description: | Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges |