From 6fb737c1c88c4773bedf65810429224c031ab881 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Mon, 11 Oct 2021 11:23:29 +0100
Subject: [PATCH] Revert "Set explicitly_egress_direct=True for ml2 ovs"

This reverts commit 0f7d135507def07196aa98cc4cf9fd518641a369.

Related-Bug: #1931696
Change-Id: I2ee90140f646170552fd3a638af2231ac9a38cad
---
 templates/ussuri/openvswitch_agent.ini | 50 --------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 templates/ussuri/openvswitch_agent.ini

diff --git a/templates/ussuri/openvswitch_agent.ini b/templates/ussuri/openvswitch_agent.ini
deleted file mode 100644
index 2f42f506..00000000
--- a/templates/ussuri/openvswitch_agent.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 -%}
-firewall_driver = neutron.agent.firewall.NoopFirewallDriver
-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 -%}