Merge "Change vxlan to geneve for network environment files"
This commit is contained in:
commit
92766d5a69
|
@ -52,13 +52,11 @@ parameter_defaults:
|
||||||
# (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
# (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
||||||
DnsServers: []
|
DnsServers: []
|
||||||
# List of Neutron network types for tenant networks (will be used in order)
|
# List of Neutron network types for tenant networks (will be used in order)
|
||||||
NeutronNetworkType: 'vxlan,vlan'
|
NeutronNetworkType: 'geneve,vlan'
|
||||||
# The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
|
|
||||||
NeutronTunnelTypes: 'vxlan'
|
|
||||||
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
||||||
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
||||||
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
||||||
# for Linux bonds w/LACP, or "bond_mode=active-backup" for OVS active/backup.
|
# for Linux bonds w/LACP, or "bond_mode=active-backup" for OVS active/backup.
|
||||||
BondInterfaceOvsOptions: "bond_mode=active-backup"
|
BondInterfaceOvsOptions: "bond_mode=active-backup"
|
||||||
# Specify Tunnel endpoints to be IPv6
|
# Specify Tunnel endpoints to be IPv6
|
||||||
NeutronOverlayIPVersion: 6
|
NeutronOverlayIPVersion: 6
|
||||||
|
|
|
@ -91,9 +91,7 @@ parameter_defaults:
|
||||||
# (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
# (ctlplane subnet(s) nameservers are confgured by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
||||||
DnsServers: []
|
DnsServers: []
|
||||||
# List of Neutron network types for tenant networks (will be used in order)
|
# List of Neutron network types for tenant networks (will be used in order)
|
||||||
NeutronNetworkType: 'vxlan,vlan'
|
NeutronNetworkType: 'geneve,vlan'
|
||||||
# The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
|
|
||||||
NeutronTunnelTypes: 'vxlan'
|
|
||||||
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
||||||
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
||||||
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
||||||
|
|
|
@ -89,9 +89,7 @@ parameter_defaults:
|
||||||
# (ctlplane subnets nameservers are controlled by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
# (ctlplane subnets nameservers are controlled by the ``undercloud_nameservers`` option in ``undercloud.conf``)
|
||||||
DnsServers: []
|
DnsServers: []
|
||||||
# List of Neutron network types for tenant networks (will be used in order)
|
# List of Neutron network types for tenant networks (will be used in order)
|
||||||
NeutronNetworkType: 'vxlan,vlan'
|
NeutronNetworkType: 'geneve,vlan'
|
||||||
# The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
|
|
||||||
NeutronTunnelTypes: 'vxlan'
|
|
||||||
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
# Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
|
||||||
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
NeutronNetworkVLANRanges: 'datacentre:1:1000'
|
||||||
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
# Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
|
||||||
|
|
Loading…
Reference in New Issue