Browse Source

Merge "Enable "port_forwarding" feature in neutron ML2 ovs environment" into stable/queens

changes/41/734341/2
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
400758a480
2 changed files with 20 additions and 1 deletions
  1. +12
    -1
      docker/services/neutron-l3.yaml
  2. +8
    -0
      releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml

+ 12
- 1
docker/services/neutron-l3.yaml View File

@ -62,11 +62,18 @@ parameters:
via parameter_defaults in the resource registry.
type: json
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:
@ -111,7 +118,11 @@ outputs:
tripleo::profile::base::neutron::l3_agent_wrappers::enable_radvd_wrapper: {get_param: NeutronEnableRadvdDockerWrapper}
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}
-
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: {get_attr: [NeutronL3Base, role_data, service_config_settings]}


+ 8
- 0
releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml 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.

Loading…
Cancel
Save