From 903b28829be33b291e9b786ffd5bd3d9f7b54279 Mon Sep 17 00:00:00 2001 From: James Denton Date: Wed, 18 May 2022 11:37:17 -0500 Subject: [PATCH] Enable FDB extension for OVS Agent when using SR-IOV This patch will enable the fdb extension for the Open vSwitch agent when ml2.sriov plugin type is enabled. This was implemented for the linuxbridge agent originally and missed for the openvswitch agent. Change-Id: Id7c6b916fdf804c43203c7d357b8fe53f60a7332 --- templates/plugins/ml2/openvswitch_agent.ini.j2 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/plugins/ml2/openvswitch_agent.ini.j2 b/templates/plugins/ml2/openvswitch_agent.ini.j2 index 03a10e3e..ccab0e94 100644 --- a/templates/plugins/ml2/openvswitch_agent.ini.j2 +++ b/templates/plugins/ml2/openvswitch_agent.ini.j2 @@ -20,14 +20,24 @@ l2_population = {{ neutron_plugins[neutron_plugin_type].l2_population }} tunnel_types = {{ neutron_tunnel_types }} enable_distributed_routing = {{ neutron_plugins[neutron_plugin_type].router_distributed | default('False') }} {% set ovs_agent_extensions = [] %} +{% if 'ml2.sriov' in neutron_plugin_types %} +{% set _ = ovs_agent_extensions.append("fdb") %} +{% endif %} {% if 'qos' in neutron_plugin_base %} {% set _ = ovs_agent_extensions.append("qos") %} {% endif %} -{% if 'sfc' in neutron_plugin_base %} +{% if 'sfc' in neutron_plugin_base %} {% set _ = ovs_agent_extensions.append("sfc") %} {% endif %} extensions = {{ ovs_agent_extensions | join(',') }} +{% if 'ml2.sriov' in neutron_plugin_types %} +# If an interface is shared between sriov ports and normal ports, it must be defined here +# to allow traffic between the two ports on the same host +[FDB] +shared_physical_device_mappings = {{ neutron_provider_networks.network_sriov_mappings }} +{% endif %} + # Security groups [securitygroup] {% if ovs_dpdk_support %}