aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
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 /puppet
parentc26dc7ea86adea9e157415aa8792d25948d85063 (diff)
parent9100016c4ea19f23a58ee526b12880c4da3812ac (diff)
Merge "switch to vxlan by default"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/compute-puppet.yaml4
-rw-r--r--puppet/controller-puppet.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 10e7527c..74e9b63e 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -100,7 +100,7 @@ parameters:
NeutronNetworkType:
type: string
description: The tenant network type for Neutron, either gre or vxlan.
- default: 'gre'
+ default: 'vxlan'
NeutronNetworkVLANRanges:
default: 'datacentre'
description: >
@@ -126,7 +126,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
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 07ed99de..f1849e3e 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -319,7 +319,7 @@ parameters:
description: Whether to enable l3-agent HA
type: string
NeutronNetworkType:
- default: 'gre'
+ default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan.
type: string
NeutronNetworkVLANRanges:
@@ -361,7 +361,7 @@ parameters:
description: If set, the public interface is a vlan with this device as the raw device.
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'