openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "switch to vxlan by default"

Browse Source
This commit is contained in:
Jenkins 2015-09-15 19:04:19 +00:00 committed by Gerrit Code Review
commit dca894b410
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

@ -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

4
controller.yaml
View File

@ -343,7 +343,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:
@ -385,7 +385,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'

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

@ -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'

4
deprecated/overcloud-source.yaml
View File

@ -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'

4
overcloud-without-mergepy.yaml
View File

@ -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'

4
puppet/compute-puppet.yaml
View File

@ -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

4
puppet/controller-puppet.yaml
View File

@ -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'