aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compute.yaml4
-rw-r--r--controller.yaml4
-rw-r--r--deprecated/nova-compute-instance.yaml4
-rw-r--r--deprecated/overcloud-source.yaml4
-rw-r--r--overcloud-without-mergepy.yaml4
-rw-r--r--puppet/compute-puppet.yaml4
-rw-r--r--puppet/controller-puppet.yaml4
7 files changed, 14 insertions, 14 deletions
diff --git a/compute.yaml b/compute.yaml
index 933639c..8789e58 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -129,7 +129,7 @@ parameters:
NeutronNetworkType:
type: string
description: The tenant network type for Neutron, either gre or vxlan.
- default: 'gre'
+ default: 'vxlan'
NeutronNetworkVLANRanges:
default: 'datacentre'
description: >
@@ -155,7 +155,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/controller.yaml b/controller.yaml
index 7ee837f..59f48b5 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -333,7 +333,7 @@ parameters:
default: 'datacentre'
description: If set, flat networks to configure in neutron plugins.
NeutronNetworkType:
- default: 'gre'
+ default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan.
type: string
NeutronNetworkVLANRanges:
@@ -375,7 +375,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'
diff --git a/deprecated/nova-compute-instance.yaml b/deprecated/nova-compute-instance.yaml
index e68c61f..811c0fc 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 d355c4d..0729b33 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'
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index fd31c54..54308b8 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -108,7 +108,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:
@@ -147,7 +147,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'
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 7966fd4..c46af07 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -97,7 +97,7 @@ parameters:
NeutronNetworkType:
type: string
description: The tenant network type for Neutron, either gre or vxlan.
- default: 'gre'
+ default: 'vxlan'
NeutronNetworkVLANRanges:
default: 'datacentre'
description: >
@@ -123,7 +123,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 291dc6e..d61db42 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -309,7 +309,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:
@@ -351,7 +351,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'