openstack/tripleo-heat-templates
Code Issues Proposed changes

Allow to configure vxlan network type for OVN

Browse Source 
Since 20.09, OVN supports VXLAN type for inter-chassis communication.

This patch also gets rid of no longer needed override for
NeutronNetworkType for OVN, moving the constraints into generic ML2
definition list. The constraints list is extended to include vxlan.

Depends-On: I81c016ba9c91282d1bebb40a282077e14ce4bd6b
Change-Id: I447458c344a8817f3cfacba06f3410d500ed1f59
This commit is contained in:
Ihar Hrachyshka 2020-09-22 17:32:35 -04:00 committed by Kamil Sambor
parent f06e502adf
commit b1204893eb
9 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment/neutron/neutron-plugin-ml2-ovn.yaml
View File

@ -79,16 +79,6 @@ parameters:
description: Whether Metadata Service has to be enabled
type: boolean
default: true
# NOTE(anil): OVN supports only VLAN, geneve and flat networks
NeutronNetworkType:
default: 'geneve'
description: The tenant network type for Neutron.
type: comma_delimited_list
constraints:
- allowed_values:
- geneve
- vlan
- flat
OVNDnsServers:
default: []
description: List of servers to use as as dns forwarders
@ -156,7 +146,6 @@ outputs:
neutron::server::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
neutron::plugins::ml2::ovn::dns_servers: {get_param: OVNDnsServers}
neutron::plugins::ml2::tenant_network_types: {get_param: NeutronNetworkType}
neutron::plugins::ml2::ovn::ovn_emit_need_to_frag: {get_param: OVNEmitNeedToFrag}
- if:
- internal_tls_enabled

2
deployment/neutron/neutron-plugin-ml2.yaml
View File

@ -36,7 +36,7 @@ parameters:
The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list
NeutronTypeDrivers:
default: "geneve,vlan,flat"
default: "geneve,vxlan,vlan,flat"
description: |
Comma-separated list of network type driver entrypoints to be loaded.
type: comma_delimited_list

2
environments/services-baremetal/neutron-ovn-dvr-ha.yaml
View File

@ -19,7 +19,7 @@ parameter_defaults:
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
NeutronVniRanges: ['1:65536', ]

2
environments/services-baremetal/neutron-ovn-ha.yaml
View File

@ -19,7 +19,7 @@ parameter_defaults:
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronEnableDVR: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
NeutronVniRanges: ['1:65536', ]

4
environments/services/neutron-ovn-dvr-ha.yaml
View File

@ -20,8 +20,8 @@ parameter_defaults:
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1

4
environments/services/neutron-ovn-ha.yaml
View File

@ -19,8 +19,8 @@ parameter_defaults:
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronEnableDVR: False
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"

4
environments/services/neutron-ovn-standalone.yaml
View File

@ -20,8 +20,8 @@ parameter_defaults:
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1

4
releasenotes/notes/vxlan-support-for-ovn-1320be8046aca9c6.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
OVN now supports VXLAN network type for tenant networks.

8
tools/yaml-validate.py
View File

@ -195,14 +195,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {
'BondInterfaceOvsOptions': ['description',
'default',
'constraints'],
# NOTE(anil): This is a temporary change and
# will be removed once bug #1767070 properly
# fixed. OVN supports only VLAN, geneve
# and flat for NeutronNetworkType. But VLAN
# tenant networks have a limited support
# in OVN. Till that is fixed, we restrict
# NeutronNetworkType to 'geneve'.
'NeutronNetworkType': ['description', 'default', 'constraints'],
'KeyName': ['constraints'],
'OVNSouthboundServerPort': ['description'],
'ExternalInterfaceDefaultRoute': ['description', 'default'],