From 8665e1de879d56a4c850c2ef7f0ea0207c4aff00 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Mon, 26 Apr 2021 19:11:02 +0300
Subject: [PATCH] Fix cri-o support for Oracle and AlmaLinux (#7541)
---
roles/container-engine/cri-o/tasks/crio_repo.yml | 8 ++++++--
roles/container-engine/cri-o/vars/almalinux-8.yml | 1 +
roles/container-engine/cri-o/vars/oraclelinux-8.yml | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 120000 roles/container-engine/cri-o/vars/almalinux-8.yml
create mode 120000 roles/container-engine/cri-o/vars/oraclelinux-8.yml
diff --git a/roles/container-engine/cri-o/tasks/crio_repo.yml b/roles/container-engine/cri-o/tasks/crio_repo.yml
index fe345347f..4e10593d4 100644
--- a/roles/container-engine/cri-o/tasks/crio_repo.yml
+++ b/roles/container-engine/cri-o/tasks/crio_repo.yml
@@ -79,7 +79,9 @@
gpgcheck: yes
gpgkey: http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_$releasever/repodata/repomd.xml.key
keepcache: '0'
- when: ansible_distribution in ["CentOS"]
+ when:
+ - ansible_os_family == "RedHat"
+ - ansible_distribution not in ["Amazon", "Fedora"]
- name: Add CRI-O kubic yum repo
yum_repository:
@@ -88,7 +90,9 @@
baseurl: "http://download.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_version }}/CentOS_$releasever/repodata/repomd.xml.key"
- when: ansible_distribution in ["CentOS"]
+ when:
+ - ansible_os_family == "RedHat"
+ - ansible_distribution not in ["Amazon", "Fedora"]
- name: Add CRI-O kubic yum repo
yum_repository:
diff --git a/roles/container-engine/cri-o/vars/almalinux-8.yml b/roles/container-engine/cri-o/vars/almalinux-8.yml
new file mode 120000
index 000000000..039ea3828
--- /dev/null
+++ b/roles/container-engine/cri-o/vars/almalinux-8.yml
@@ -0,0 +1 @@
+centos-8.yml
\ No newline at end of file
diff --git a/roles/container-engine/cri-o/vars/oraclelinux-8.yml b/roles/container-engine/cri-o/vars/oraclelinux-8.yml
new file mode 120000
index 000000000..039ea3828
--- /dev/null
+++ b/roles/container-engine/cri-o/vars/oraclelinux-8.yml
@@ -0,0 +1 @@
+centos-8.yml
\ No newline at end of file
--
GitLab