From 83eb19a3b85b263841d0bf67542fdca2903ea628 Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Tue, 30 Nov 2021 09:26:48 +0000
Subject: [PATCH] cri-o: use cgroupsv2 where available (fedora)

---
 .gitlab-ci/packet.yml                        |  5 +++++
 docs/ci.md                                   |  2 +-
 roles/container-engine/cri-o/tasks/main.yaml | 16 ----------------
 tests/files/packet_fedora35-crio.yml         | 11 +++++++++++
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 tests/files/packet_fedora35-crio.yml

diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index c502a805c21..15d7e7aee1c 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -234,6 +234,11 @@ packet_fedora35-calico-swap-selinux:
   extends: .packet_pr
   when: manual
 
+packet_fedora35-crio:
+  stage: deploy-part2
+  extends: .packet_pr
+  when: manual
+
 packet_amazon-linux-2-aio:
   stage: deploy-part2
   extends: .packet_pr
diff --git a/docs/ci.md b/docs/ci.md
index 39b05f99073..77fe91bb085 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -33,7 +33,7 @@ debian11 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora33 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 fedora34 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora35 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+fedora35 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 opensuse |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 oracle7 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 ubuntu16 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
index d3997f4a5ff..45e60ef747f 100644
--- a/roles/container-engine/cri-o/tasks/main.yaml
+++ b/roles/container-engine/cri-o/tasks/main.yaml
@@ -35,22 +35,6 @@
   tags:
     - facts
 
-- name: disable unified_cgroup_hierarchy in Fedora 31+
-  command: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
-  when:
-    - ansible_distribution == "Fedora"
-    - (ansible_distribution_major_version | int) >= 31
-    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
-    - not is_ostree
-
-- name: reboot in Fedora 31+
-  reboot:
-  when:
-    - ansible_distribution == "Fedora"
-    - (ansible_distribution_major_version | int) >= 31
-    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
-    - not is_ostree
-
 - name: import crio repo
   import_tasks: "crio_repo.yml"
   when: crio_add_repos
diff --git a/tests/files/packet_fedora35-crio.yml b/tests/files/packet_fedora35-crio.yml
new file mode 100644
index 00000000000..a1ec9374e41
--- /dev/null
+++ b/tests/files/packet_fedora35-crio.yml
@@ -0,0 +1,11 @@
+---
+# Instance settings
+cloud_image: fedora-35
+mode: default
+
+# Kubespray settings
+container_manager: crio
+auto_renew_certificates: true
+
+# Test with SELinux in enforcing mode
+preinstall_selinux_state: enforcing