[cri-o] support cri-o 1.24 with kube 1.24

roles/container-engine/cri-o/tasks/crio_repo.yml

@@ -114,6 +114,29 @@
     - ansible_os_family == "RedHat"
     - ansible_distribution not in ["Amazon", "Fedora"]
 
+- name: Add CRI-O kubic yum repo
+  yum_repository:
+    name: devel_kubic_libcontainers_stable
+    description: Stable Releases of Upstream github.com/containers packages
+    baseurl: http://{{ crio_download_base }}/Fedora_{{ ansible_distribution_major_version }}/
+    gpgcheck: yes
+    gpgkey: http://{{ crio_download_base }}/Fedora_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key
+    keepcache: "0"
+  when:
+    - ansible_distribution in ["Fedora"]
+    - not is_ostree
+
+- name: Add CRI-O kubic yum repo
+  yum_repository:
+    name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}"
+    description: "CRI-O {{ crio_version }}"
+    baseurl: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_distribution_major_version }}/"
+    gpgcheck: yes
+    gpgkey: "{{ crio_download_crio }}{{ crio_version }}/Fedora_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key"
+  when:
+    - ansible_distribution in ["Fedora"]
+    - not is_ostree
+
 - name: Add CRI-O kubic yum repo
   yum_repository:
     name: devel_kubic_libcontainers_stable
@@ -154,14 +177,3 @@
   when:
     - is_ostree
     - ostree_version is defined and ostree_version.stdout is version('2021.9', '>=')
-
-- name: Enable CRI-O module
-  command: "dnf -y module enable cri-o:{{ crio_version }}"
-  args:
-    warn: False
-  register: crio_dnf_result
-  changed_when: "'Enabling' in crio_dnf_result.stdout"
-  become: true
-  when:
-    - ansible_distribution in ["Fedora"]
-    - not is_ostree

roles/container-engine/cri-o/tasks/main.yaml

@@ -39,9 +39,6 @@
   import_tasks: "crio_repo.yml"
   when: crio_add_repos
 
-- include_role:  # noqa unnamed-task
-    name: container-engine/crictl
-
 - name: Build a list of crio runtimes with Katacontainers runtimes
   set_fact:
     crio_runtimes: "{{ crio_runtimes + kata_runtimes  }}"