From a8fee6b3f2543a50be84698ea4c382e47b8ad811 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Fri, 20 Sep 2019 12:29:57 +0200 Subject: [PATCH] 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 95f889720c2f7e8467cc0f488ad0176dcafffe6a) --- docker/services/neutron-l3.yaml | 13 ++++++++++++- ...port-forwarding-in-neutron-956cb21a3310e881.yaml | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index 1bcbc59e80..9c9dbba9e2 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -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]} diff --git a/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml b/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml new file mode 100644 index 0000000000..53c6b693a1 --- /dev/null +++ b/releasenotes/notes/enable-port-forwarding-in-neutron-956cb21a3310e881.yaml @@ -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.