From 9cef00325c79006e2daa55acdee9d4b86d48a1b2 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Mon, 6 Feb 2023 09:12:25 +0100
Subject: [PATCH] Disable "stateless SG" API extension in Neutron

As long as Tobiko jobs are running on Ubuntu older than 22.04 we should
disable stateless SG there as OVN in such Ubuntu is too old and don't
support ACL action "allow-stateless".

Change-Id: I017c4fdafc712ffdfcc66105edd87968c60ce5e6
---
 zuul.d/devstack-tobiko-centos.yaml  | 8 ++++++++
 zuul.d/devstack-tobiko-fedora.yaml  | 8 ++++++++
 zuul.d/devstack-tobiko-minimal.yaml | 7 +++++++
 zuul.d/devstack-tobiko.yaml         | 7 +++++++
 4 files changed, 30 insertions(+)

diff --git a/zuul.d/devstack-tobiko-centos.yaml b/zuul.d/devstack-tobiko-centos.yaml
index 05f02db..431f1f7 100644
--- a/zuul.d/devstack-tobiko-centos.yaml
+++ b/zuul.d/devstack-tobiko-centos.yaml
@@ -18,3 +18,11 @@
     nodeset: devstack-tobiko-centos
     voting: false
     description: CentOS Devstack Tobiko Plugin job
+    vars:
+      devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            ovn:
+              # NOTE(slaweq): In Centos OVN already supports allow-stateless
+              # keyword as an ACL's action
+              allow_stateless_action_supported: True
diff --git a/zuul.d/devstack-tobiko-fedora.yaml b/zuul.d/devstack-tobiko-fedora.yaml
index 9acdc46..c97b13c 100644
--- a/zuul.d/devstack-tobiko-fedora.yaml
+++ b/zuul.d/devstack-tobiko-fedora.yaml
@@ -17,3 +17,11 @@
     nodeset: devstack-tobiko-fedora
     voting: false
     description: Fedora Devstack Tobiko Plugin job
+    vars:
+      devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            ovn:
+              # NOTE(slaweq): In Fedora OVN already supports allow-stateless
+              # keyword as an ACL's action
+              allow_stateless_action_supported: True
diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index 86ff7cd..ef29f8a 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -57,6 +57,13 @@
         s-proxy: false
         # NOTE(slaweq): without Swift, c-bak cannot run (in the Gate at least)
         c-bak: false
+      devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            ovn:
+              # TODO(slaweq): remove this config option once jobs will be
+              # migrated to Ubuntu 22.04 or newer
+              allow_stateless_action_supported: False
       zuul_copy_output:
         '{{ stage_dir }}/stackviz': logs
         "{{ devstack_base_dir }}/data/ovn": "logs"
diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml
index bd1041c..89525d9 100644
--- a/zuul.d/devstack-tobiko.yaml
+++ b/zuul.d/devstack-tobiko.yaml
@@ -82,6 +82,13 @@
         s-proxy: false
         # NOTE(slaweq): without Swift, c-bak cannot run (in the Gate at least)
         c-bak: false
+      devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            ovn:
+              # TODO(slaweq): remove this config option once jobs will be
+              # migrated to Ubuntu 22.04 or newer
+              allow_stateless_action_supported: False
       ipv4_dns_nameservers:
         - 1.0.0.1
         - 8.8.8.8