fix CRI-O repos for centos distributions (#6224)

* fix CRI-O repos for centos distributions

* fix CRI-O repos for centos distributions
- revert workarounds

* fix CRI-O repos for centos distributions
- use https for centos repos

* avoid 302 redirects for centos repos

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

@@ -22,7 +22,7 @@
   yum_repository:
     name: devel_kubic_libcontainers_stable
     description: Stable Releases of Upstream github.com/containers packages (CentOS_$releasever)
-    baseurl: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/
+    baseurl: http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/
     gpgcheck: yes
     gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key
   when: ansible_distribution in ["CentOS"]
@@ -30,10 +30,10 @@
 - name: Add CRI-O kubic repo
   yum_repository:
     name: "devel_kubic_libcontainers_stable_cri-o_{{ crio_version }}"
-    description: 1.17 (CentOS_$releasever)
-    baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/"
+    description: "CRI-O {{ crio_version }} (CentOS_$releasever)"
+    baseurl: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/"
     gpgcheck: yes
-    gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/repodata/repomd.xml.key"
+    gpgkey: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key"
   when: ansible_distribution in ["CentOS"]
 
 - name: Enable modular repos for CRI-O

roles/container-engine/cri-o/vars/centos-7.yml

@@ -3,8 +3,3 @@
 crio_packages:
   - cri-o
   - oci-systemd-hook
-
-crio_repo_path:
-  "1.18": "1.17:/1.17.4"
-  "1.17": "1.17:/1.17.4"
-  "1.16": "1.16"
\ No newline at end of file

roles/container-engine/cri-o/vars/centos-8.yml

@@ -2,8 +2,3 @@
 
 crio_packages:
   - cri-o
-
-crio_repo_path:
-  "1.18": "1.18:/1.18.0"
-  "1.17": "1.17:/1.17.4"
-  "1.16": "1.16"
\ No newline at end of file