Workaround about inconsistent CRI-O YUM repo path on Kubic repos (#6101)

kubernetes-sigs · May 7, 2020 · 218b2a5 · 218b2a5
1 parent 61e7afa
commit 218b2a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/roles/container-engine/cri-o/tasks/crio_repo.yml b/roles/container-engine/cri-o/tasks/crio_repo.yml
@@ -31,9 +31,9 @@
   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_version }}/CentOS_$releasever/"
+    baseurl: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/"
     gpgcheck: yes
-    gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key"
+    gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_repo_path[crio_required_version] }}/CentOS_$releasever/repodata/repomd.xml.key"
   when: ansible_distribution in ["CentOS"]
 
 - name: Enable modular repos for CRI-O

diff --git a/roles/container-engine/cri-o/vars/centos-7.yml b/roles/container-engine/cri-o/vars/centos-7.yml
@@ -3,3 +3,8 @@
 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"
diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml
@@ -2,3 +2,8 @@
 
 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"