openstack
/
tripleo-heat-templates
Code Issues Proposed changes

switch to vxlan by default 

VXLAN has better performance (20-25% better)
NICs with VXLAN offload are more common

Change-Id: If57c79a1309ae178b3e82d54bb101dde584c86cc
Related: rhbz#1244864
This commit is contained in:
Mike Burns 2015-08-21 12:50:37 -04:00
parent 6f7b2fefb0
commit 9100016c4e
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compute.yaml
View File

@ -129,7 +129,7 @@ parameters:
NeutronNetworkType: NeutronNetworkType:
type: string type: string
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
default: 'gre' default: 'vxlan'
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
default: 'datacentre' default: 'datacentre'
description: > description: >
@ -155,7 +155,7 @@ parameters:
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'
default: 'gre' default: 'vxlan'
NeutronTunnelIdRanges: NeutronTunnelIdRanges:
description: | description: |
Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges

4
controller.yaml
View File

@ -333,7 +333,7 @@ parameters:
default: 'datacentre' default: 'datacentre'
description: If set, flat networks to configure in neutron plugins. description: If set, flat networks to configure in neutron plugins.
NeutronNetworkType: NeutronNetworkType:
default: 'gre' default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
type: string type: string
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
@ -375,7 +375,7 @@ parameters:
description: If set, the public interface is a vlan with this device as the raw device. description: If set, the public interface is a vlan with this device as the raw device.
type: string type: string
NeutronTunnelTypes: NeutronTunnelTypes:
default: 'gre' default: 'vxlan'
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'

4
deprecated/nova-compute-instance.yaml
View File

@ -100,7 +100,7 @@ parameters:
NeutronHost: NeutronHost:
type: string type: string
NeutronNetworkType: NeutronNetworkType:
default: 'gre' default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
type: string type: string
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
@ -114,7 +114,7 @@ parameters:
description: A port to add to the NeutronPhysicalBridge. description: A port to add to the NeutronPhysicalBridge.
type: string type: string
NeutronTunnelTypes: NeutronTunnelTypes:
default: 'gre' default: 'vxlan'
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'

4
deprecated/overcloud-source.yaml
View File

@ -221,7 +221,7 @@ parameters:
If set, flat networks to configure in neutron plugins. Defaults to If set, flat networks to configure in neutron plugins. Defaults to
'datacentre' to permit external network creation. 'datacentre' to permit external network creation.
NeutronNetworkType: NeutronNetworkType:
default: 'gre' default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
type: string type: string
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
@ -279,7 +279,7 @@ parameters:
description: Shared secret to prevent spoofing description: Shared secret to prevent spoofing
type: string type: string
NeutronTunnelTypes: NeutronTunnelTypes:
default: 'gre' default: 'vxlan'
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'

4
overcloud-without-mergepy.yaml
View File

@ -108,7 +108,7 @@ parameters:
If set, flat networks to configure in neutron plugins. Defaults to If set, flat networks to configure in neutron plugins. Defaults to
'datacentre' to permit external network creation. 'datacentre' to permit external network creation.
NeutronNetworkType: NeutronNetworkType:
default: 'gre' default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
type: string type: string
NeutronPassword: NeutronPassword:
@ -147,7 +147,7 @@ parameters:
description: Shared secret to prevent spoofing description: Shared secret to prevent spoofing
type: string type: string
NeutronTunnelTypes: NeutronTunnelTypes:
default: 'gre' default: 'vxlan'
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'

4
puppet/compute-puppet.yaml
View File

@ -97,7 +97,7 @@ parameters:
NeutronNetworkType: NeutronNetworkType:
type: string type: string
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
default: 'gre' default: 'vxlan'
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
default: 'datacentre' default: 'datacentre'
description: > description: >
@ -123,7 +123,7 @@ parameters:
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'
default: 'gre' default: 'vxlan'
NeutronTunnelIdRanges: NeutronTunnelIdRanges:
description: | description: |
Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges

4
puppet/controller-puppet.yaml
View File

@ -309,7 +309,7 @@ parameters:
description: Whether to enable l3-agent HA description: Whether to enable l3-agent HA
type: string type: string
NeutronNetworkType: NeutronNetworkType:
default: 'gre' default: 'vxlan'
description: The tenant network type for Neutron, either gre or vxlan. description: The tenant network type for Neutron, either gre or vxlan.
type: string type: string
NeutronNetworkVLANRanges: NeutronNetworkVLANRanges:
@ -351,7 +351,7 @@ parameters:
description: If set, the public interface is a vlan with this device as the raw device. description: If set, the public interface is a vlan with this device as the raw device.
type: string type: string
NeutronTunnelTypes: NeutronTunnelTypes:
default: 'gre' default: 'vxlan'
description: | description: |
The tunnel types for the Neutron tenant network. To specify multiple The tunnel types for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'gre,vxlan' values, use a comma separated string, like so: 'gre,vxlan'