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:
    docker/services/neutron-l3.yaml
    environments/services/neutron-ovs.yaml

Change-Id: I2417f9f6a436ae7a3820e16fdf6210099807b651
(cherry picked from commit 95f889720c)
This commit is contained in:
Slawek Kaplonski 2019-09-20 12:29:57 +02:00
parent ebeb2a15dd
commit 38a6716934
2 changed files with 19 additions and 1 deletions

View File

@ -76,12 +76,18 @@ parameters:
specified, because radvd is spawned as root, no "username" parameter
will be passed
type: string
NeutronL3AgentExtensions:
default: ""
description: |
Comma-separated list of extensions enabled for the Neutron L3 agent.
type: comma_delimited_list
conditions:
keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
haproxy_wrapper_enabled: {equals: [{get_param: NeutronEnableHaproxyDockerWrapper}, true]}
dibbler_wrapper_enabled: {equals: [{get_param: NeutronEnableDibblerDockerWrapper}, true]}
radvd_wrapper_enabled: {equals: [{get_param: NeutronEnableRadvdDockerWrapper}, true]}
l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}
resources:
@ -127,7 +133,11 @@ outputs:
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_process_wrapper: '/var/lib/neutron/radvd_wrapper'
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: DockerNeutronL3AgentImage}
- neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
-
if:
- l3_agent_extensions_empty
- {}
- neutron::agents::l3::extensions: {get_param: NeutronL3AgentExtensions}
logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
service_config_settings:

View File

@ -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.