Enable flat network for ovn
Change-Id: I0883b4f1881887cae68da9658d2e237218b694c4
Closes-Bug: #1821171
(cherry picked from commit 98c2b78dcb
)
This commit is contained in:
parent
0555f57e12
commit
95b2354031
|
@ -21,7 +21,7 @@ parameter_defaults:
|
||||||
OVNTunnelEncapType: geneve
|
OVNTunnelEncapType: geneve
|
||||||
NeutronEnableDHCPAgent: false
|
NeutronEnableDHCPAgent: false
|
||||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: ['geneve', 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ parameter_defaults:
|
||||||
OVNTunnelEncapType: geneve
|
OVNTunnelEncapType: geneve
|
||||||
NeutronEnableDHCPAgent: false
|
NeutronEnableDHCPAgent: false
|
||||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns"
|
||||||
|
|
|
@ -23,7 +23,7 @@ parameter_defaults:
|
||||||
OVNTunnelEncapType: geneve
|
OVNTunnelEncapType: geneve
|
||||||
NeutronEnableDHCPAgent: false
|
NeutronEnableDHCPAgent: false
|
||||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronEnableDVR: true
|
NeutronEnableDVR: true
|
||||||
|
|
|
@ -21,7 +21,7 @@ parameter_defaults:
|
||||||
OVNTunnelEncapType: geneve
|
OVNTunnelEncapType: geneve
|
||||||
NeutronEnableDHCPAgent: false
|
NeutronEnableDHCPAgent: false
|
||||||
NeutronTypeDrivers: 'geneve,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: ['geneve' , 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
NeutronServicePlugins: 'qos,ovn-router,trunk'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns"
|
||||||
|
|
|
@ -71,10 +71,7 @@ parameters:
|
||||||
description: Whether Metadata Service has to be enabled
|
description: Whether Metadata Service has to be enabled
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
# NOTE(anil): OVN supports only VLAN and geneve networks. But VLAN
|
# NOTE(anil): OVN supports only VLAN, geneve and flat networks
|
||||||
# tenant networks have a limited support in OVN. So allowing only
|
|
||||||
# geneve networks until the problems are addressed.
|
|
||||||
# See bug #1767070 for more information.
|
|
||||||
NeutronNetworkType:
|
NeutronNetworkType:
|
||||||
default: 'geneve'
|
default: 'geneve'
|
||||||
description: The tenant network type for Neutron.
|
description: The tenant network type for Neutron.
|
||||||
|
@ -82,6 +79,8 @@ parameters:
|
||||||
constraints:
|
constraints:
|
||||||
- allowed_values:
|
- allowed_values:
|
||||||
- geneve
|
- geneve
|
||||||
|
- vlan
|
||||||
|
- flat
|
||||||
OVNDnsServers:
|
OVNDnsServers:
|
||||||
default: []
|
default: []
|
||||||
description: List of servers to use as as dns forwarders
|
description: List of servers to use as as dns forwarders
|
||||||
|
|
|
@ -115,10 +115,10 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
|
||||||
'constraints'],
|
'constraints'],
|
||||||
# NOTE(anil): This is a temporary change and
|
# NOTE(anil): This is a temporary change and
|
||||||
# will be removed once bug #1767070 properly
|
# will be removed once bug #1767070 properly
|
||||||
# fixed. OVN supports only VLAN and geneve
|
# fixed. OVN supports only VLAN, geneve
|
||||||
# for NeutronNetworkType. But VLAN tenant
|
# and flat for NeutronNetworkType. But VLAN
|
||||||
# networks have a limited support in OVN.
|
# tenant networks have a limited support
|
||||||
# Till that is fixed, we restrict
|
# in OVN. Till that is fixed, we restrict
|
||||||
# NeutronNetworkType to 'geneve'.
|
# NeutronNetworkType to 'geneve'.
|
||||||
'NeutronNetworkType': ['description',
|
'NeutronNetworkType': ['description',
|
||||||
'default',
|
'default',
|
||||||
|
|
Loading…
Reference in New Issue