From 0f7d135507def07196aa98cc4cf9fd518641a369 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Fri, 11 Jun 2021 11:33:10 +0100
Subject: [PATCH] Set explicitly_egress_direct=True for ml2 ovs

This fixes a regression introduced in 16.3.0 neutron
release that causes non-offloaded ports to break on
hypervisors that have offloaded enabled.

Closes-Bug: #1931696
Change-Id: I1e884eac26d51c825736f34bcbfdccc906944b8d
---
 templates/ussuri/openvswitch_agent.ini | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 templates/ussuri/openvswitch_agent.ini

diff --git a/templates/ussuri/openvswitch_agent.ini b/templates/ussuri/openvswitch_agent.ini
new file mode 100644
index 00000000..757d5219
--- /dev/null
+++ b/templates/ussuri/openvswitch_agent.ini
@@ -0,0 +1,49 @@
+# queens
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+# Config managed by neutron-openvswitch charm
+###############################################################################
+[ovs]
+enable_tunneling = True
+local_ip = {{ local_ip }}
+bridge_mappings = {{ bridge_mappings }}
+{% if enable_dpdk -%}
+datapath_type = netdev
+vhostuser_socket_dir = /run/libvirt-vhost-user
+{% endif -%}
+of_inactivity_probe = {{ of_inactivity_probe }}
+
+[agent]
+tunnel_types = {{ overlay_network_type }}
+l2_population = {{ l2_population }}
+enable_distributed_routing = {{ distributed_routing }}
+prevent_arp_spoofing = {{ prevent_arp_spoofing }}
+{% if veth_mtu -%}
+veth_mtu = {{ veth_mtu }}
+{% endif -%}
+polling_interval = {{ polling_interval }}
+{% if extension_drivers -%}
+extensions = {{ extension_drivers }}
+{% endif -%}
+# See LP 1931696
+explicitly_egress_direct = True
+
+[securitygroup]
+{% if neutron_security_groups and not enable_dpdk -%}
+enable_security_group = True
+firewall_driver = {{ firewall_driver }}
+{% else -%}
+enable_security_group = False
+{% endif -%}
+
+{% if enable_nsg_logging -%}
+[network_log]
+{% if nsg_log_rate_limit -%}
+rate_limit = {{ nsg_log_rate_limit }}
+{% endif -%}
+burst_limit = {{ nsg_log_burst_limit }}
+{% if nsg_log_output_base -%}
+local_output_log_base = {{ nsg_log_output_base }}
+{% endif -%}
+{% endif -%}