Enable "port_forwarding" feature in neutron ML2 ovs environment
This patch enables port_forwarding service plugin and L3 agent's extension in case of ML2/OVS environment. It don't enable it in ML2/OVN cases as networking-ovn don't support port_forwarding yet. This patch also adds NeutronL3AgentExtensions config option for Neutron L3 agent. This new option is used to enable "port_forwarding" extension on L3 agent. Change-Id: I2417f9f6a436ae7a3820e16fdf6210099807b651
This commit is contained in:
parent
56cc922ca9
commit
95f889720c
@ -122,6 +122,11 @@ parameters:
|
|||||||
parameter should be unset.
|
parameter should be unset.
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
|
NeutronL3AgentExtensions:
|
||||||
|
default: ""
|
||||||
|
description: |
|
||||||
|
Comma-separated list of extensions enabled for the Neutron L3 agent.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
|
keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
|
||||||
@ -132,6 +137,7 @@ conditions:
|
|||||||
service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
|
service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
|
||||||
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
||||||
az_unset: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
|
az_unset: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
|
||||||
|
l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
@ -215,6 +221,10 @@ outputs:
|
|||||||
- az_unset
|
- az_unset
|
||||||
- {}
|
- {}
|
||||||
- neutron::agents::l3::availability_zone: {get_param: NeutronL3AgentAvailabilityZone}
|
- neutron::agents::l3::availability_zone: {get_param: NeutronL3AgentAvailabilityZone}
|
||||||
|
if:
|
||||||
|
- l3_agent_extensions_empty
|
||||||
|
- {}
|
||||||
|
- neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, service_config_settings]
|
- get_attr: [NeutronBase, role_data, service_config_settings]
|
||||||
|
@ -28,8 +28,10 @@ parameter_defaults:
|
|||||||
|
|
||||||
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
|
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
|
||||||
NeutronNetworkType: 'vxlan'
|
NeutronNetworkType: 'vxlan'
|
||||||
NeutronServicePlugins: 'router,qos,segments,trunk'
|
NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
KernelIpNonLocalBind: 0
|
KernelIpNonLocalBind: 0
|
||||||
|
|
||||||
NeutronEnableDVR: false
|
NeutronEnableDVR: false
|
||||||
|
|
||||||
|
NeutronL3AgentExtensions: "port_forwarding"
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
Add "port_forwarding" service plugin and L3 agent extension to be enabled
|
||||||
|
by default when Neutron ML2 plugin with OVS driver is used.
|
||||||
|
New config option "NeutronL3AgentExtensions" is also added. This
|
||||||
|
new option allows to set list of L3 agent's extensions which should be
|
||||||
|
used by agent.
|
Loading…
x
Reference in New Issue
Block a user