From 218b2a59928ef2cd422813aa459357f32dce45e9 Mon Sep 17 00:00:00 2001
From: Florent Monbillard <f.monbillard@gmail.com>
Date: Thu, 7 May 2020 15:59:42 -0400
Subject: [PATCH] Workaround about inconsistent CRI-O YUM repo path on Kubic
 repos (#6101)

---
 roles/container-engine/cri-o/tasks/crio_repo.yml | 4 ++--
 roles/container-engine/cri-o/vars/centos-7.yml   | 5 +++++
 roles/container-engine/cri-o/vars/centos-8.yml   | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/roles/container-engine/cri-o/tasks/crio_repo.yml b/roles/container-engine/cri-o/tasks/crio_repo.yml
index d3f700dae..8bd454ba8 100644
--- 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
index 740adbc6b..29f69b37e 100644
--- 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"
\ No newline at end of file
diff --git a/roles/container-engine/cri-o/vars/centos-8.yml b/roles/container-engine/cri-o/vars/centos-8.yml
index 121180879..943b09146 100644
--- 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"
\ No newline at end of file