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.
Conflicts:
deployment/neutron/neutron-l3-container-puppet.yaml
environments/services/neutron-ovs.yaml
Change-Id: I2417f9f6a436ae7a3820e16fdf6210099807b651
(cherry picked from commit 95f889720c
)
This commit is contained in:
parent
4b7ef6c057
commit
2ab5aa36a4
@ -114,6 +114,11 @@ parameters:
|
||||
parameter should be unset.
|
||||
type: string
|
||||
default: ''
|
||||
NeutronL3AgentExtensions:
|
||||
default: ""
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron L3 agent.
|
||||
type: comma_delimited_list
|
||||
|
||||
NeutronL3AgentRadvdUser:
|
||||
default: "root"
|
||||
@ -133,6 +138,7 @@ conditions:
|
||||
docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
|
||||
service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
|
||||
external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
|
||||
l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
|
||||
|
||||
resources:
|
||||
|
||||
@ -213,6 +219,10 @@ outputs:
|
||||
- {}
|
||||
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
||||
- neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
|
||||
if:
|
||||
- l3_agent_extensions_empty
|
||||
- {}
|
||||
- neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
|
||||
service_config_settings:
|
||||
map_merge:
|
||||
- get_attr: [NeutronBase, role_data, service_config_settings]
|
||||
|
@ -28,8 +28,10 @@ parameter_defaults:
|
||||
|
||||
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
|
||||
NeutronNetworkType: 'vxlan'
|
||||
NeutronServicePlugins: 'router,qos,segments,trunk'
|
||||
NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
|
||||
NeutronVniRanges: ['1:4094', ]
|
||||
KernelIpNonLocalBind: 0
|
||||
|
||||
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…
Reference in New Issue
Block a user