openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable flat network for ovn"

Browse Source
This commit is contained in:
Zuul 2019-03-30 00:04:59 +00:00 committed by Gerrit Code Review
commit e52cdf2fc8
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-ml2-ovn-ha.yaml
View File

@ -20,7 +20,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronNetworkType: ['geneve', 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]

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

@ -22,7 +22,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1

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

@ -20,7 +20,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"

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

@ -22,7 +22,7 @@ parameter_defaults:
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: ['geneve' , 'vlan']
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronRpcWorkers: 1

4
puppet/services/neutron-plugin-ml2-ovn.yaml
View File

@ -71,7 +71,7 @@ parameters:
description: Whether Metadata Service has to be enabled
type: boolean
default: true
# NOTE(anil): OVN supports only VLAN and geneve networks
# NOTE(anil): OVN supports only VLAN, geneve and flat networks
NeutronNetworkType:
default: 'geneve'
description: The tenant network type for Neutron.
@ -80,7 +80,7 @@ parameters:
- allowed_values:
- geneve
- vlan
- flat
OVNDnsServers:
default: []
description: List of servers to use as as dns forwarders

8
tools/yaml-validate.py
View File

@ -174,10 +174,10 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
'constraints'],
# NOTE(anil): This is a temporary change and
# will be removed once bug #1767070 properly
# fixed. OVN supports only VLAN and geneve
# for NeutronNetworkType. But VLAN tenant
# networks have a limited support in OVN.
# Till that is fixed, we restrict
# 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',