From 71ac235fa39c1781154ec86dd2eb72e209d92f4d Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@gmail.com>
Date: Thu, 30 Mar 2023 11:17:04 +0000
Subject: [PATCH] Revert "Ensure systemd-udev is installed for gluster"

This reverts commit 54cf778a8bf640763d4b0fc57b4eee75cd98cf7c.

Reason for revert: This patch ideally should not be needed at all, since originally task was failing already after "Install gluster repo packages" task, but this task was not installing systemd-udev for some reason, while installing glusterfs-server.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/879069
Change-Id: I5bd6250a3961ea056f73886484e9ac67a7090aff
---
 roles/glusterfs/tasks/main.yml | 25 ++++++++++++-------------
 zuul.d/project.yaml            |  8 --------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/roles/glusterfs/tasks/main.yml b/roles/glusterfs/tasks/main.yml
index 967c40f9..9ee0dd13 100644
--- a/roles/glusterfs/tasks/main.yml
+++ b/roles/glusterfs/tasks/main.yml
@@ -41,24 +41,23 @@
       package:
         name: "{{ glusterfs_server_dnf_sig_packages }}"
 
+    - name: Apply systemctl overrides
+      import_role:
+        name: systemd_service
+      vars:
+        systemd_services:
+          - service_name: systemd-tmpfiles-setup-dev
+            load: false
+            systemd_overrides_only: true
+            systemd_overrides:
+              Unit:
+                ConditionCapability: ""
+
 - name: Install glusterfs server packages
   package:
     name: "{{ glusterfs_server_distro_packages }}"
     state: "{{ glusterfs_package_state }}"
 
-- name: Apply systemctl overrides
-  include_role:
-    name: systemd_service
-  vars:
-    systemd_services:
-      - service_name: systemd-tmpfiles-setup-dev
-        load: false
-        systemd_overrides_only: true
-        systemd_overrides:
-          Unit:
-            ConditionCapability: ""
-  when: ansible_facts['pkg_mgr'] == 'dnf'
-
 - name: Drop glusterfs-wait.sh script
   copy:
     src: glusterfs-wait.sh
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3877ef5c..a2262847 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,11 +21,3 @@
       - openstack-ansible-role-jobs
       - openstack-ansible-upgrade-infra_lxc-jobs
       - openstack-ansible-deploy-infra_lxc-jobs
-    check:
-      jobs:
-        - openstack-ansible-deploy-infra_lxc-centos-9-stream:
-            voting: false
-    gate:
-      jobs:
-        - openstack-ansible-deploy-infra_lxc-centos-9-stream:
-            voting: false