Browse Source

Enable flat network for ovn

Change-Id: I0883b4f1881887cae68da9658d2e237218b694c4
Closes-Bug: #1821171
(cherry picked from commit 98c2b78dcb)
changes/37/648937/2
Kamil Sambor 2 years ago
parent
commit
95b2354031
  1. 2
      environments/neutron-ml2-ovn-ha.yaml
  2. 2
      environments/services-docker/neutron-ovn-ha.yaml
  3. 2
      environments/services/neutron-ovn-dvr-ha.yaml
  4. 2
      environments/services/neutron-ovn-ha.yaml
  5. 7
      puppet/services/neutron-plugin-ml2-ovn.yaml
  6. 8
      tools/yaml-validate.py

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

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

2
environments/services-docker/neutron-ovn-ha.yaml

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

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

@ -23,7 +23,7 @@ parameter_defaults:
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronEnableDVR: true

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

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

7
puppet/services/neutron-plugin-ml2-ovn.yaml

@ -71,10 +71,7 @@ parameters:
description: Whether Metadata Service has to be enabled
type: boolean
default: true
# NOTE(anil): OVN supports only VLAN and geneve networks. But VLAN
# tenant networks have a limited support in OVN. So allowing only
# geneve networks until the problems are addressed.
# See bug #1767070 for more information.
# NOTE(anil): OVN supports only VLAN, geneve and flat networks
NeutronNetworkType:
default: 'geneve'
description: The tenant network type for Neutron.
@ -82,6 +79,8 @@ parameters:
constraints:
- allowed_values:
- geneve
- vlan
- flat
OVNDnsServers:
default: []
description: List of servers to use as as dns forwarders

8
tools/yaml-validate.py

@ -115,10 +115,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',

Loading…
Cancel
Save