From 4fcf8d2c7a5b99528806103daffd7eeeac5d161f Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 16 Mar 2022 06:29:55 +0000
Subject: [PATCH] Do not apply work-around to OVN deploys

---
 zaza/openstack/charm_tests/octavia/setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zaza/openstack/charm_tests/octavia/setup.py b/zaza/openstack/charm_tests/octavia/setup.py
index f126ba1..9560e43 100644
--- a/zaza/openstack/charm_tests/octavia/setup.py
+++ b/zaza/openstack/charm_tests/octavia/setup.py
@@ -168,6 +168,10 @@ def disable_ohm_port_security():
 
 def bug_1964117_workaround():
     """Apply Bug #1964117 if allowed."""
+    if openstack.ovn_present():
+        # Issue only known to affect ml2 ovs so if do not apply work around
+        # to ovn deploys.
+        return
     allow_pkg_list = ['2.16.0-0ubuntu2.1~cloud0']
     allow_release_list = ['focal_xena']
     _allow_release_list = [