From fc8551bcba22f104dc8b5cc92ff5cbd7dcea3fa7 Mon Sep 17 00:00:00 2001
From: petruha <5363545+p37ruh4@users.noreply.github.com>
Date: Fri, 5 Feb 2021 09:46:52 +0100
Subject: [PATCH] Run containerd related tasks on OracleLinux. (#7250)
---
roles/container-engine/containerd/tasks/containerd_repo.yml | 4 ++--
roles/container-engine/containerd/tasks/main.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/container-engine/containerd/tasks/containerd_repo.yml b/roles/container-engine/containerd/tasks/containerd_repo.yml
index 29b26afb5..4c03cf7d1 100644
--- a/roles/container-engine/containerd/tasks/containerd_repo.yml
+++ b/roles/container-engine/containerd/tasks/containerd_repo.yml
@@ -25,8 +25,8 @@
dest: "{{ yum_repo_dir }}/containerd.repo"
when: ansible_distribution == "Fedora"
-- name: Configure containerd repository on RedHat/CentOS
+- name: Configure containerd repository on RedHat/OracleLinux/CentOS
template:
src: "rh_containerd.repo.j2"
dest: "{{ yum_repo_dir }}/containerd.repo"
- when: ansible_distribution in ["CentOS","RedHat"]
+ when: ansible_distribution in ["CentOS", "OracleLinux", "RedHat"]
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index cdbfcb252..d8ac96321 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -13,7 +13,7 @@
fail:
msg: "{{ ansible_distribution }} is not supported by containerd."
when:
- - not ansible_distribution in ["CentOS","RedHat", "Ubuntu", "Debian", "Fedora"]
+ - not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora"]
- name: gather os specific variables
include_vars: "{{ item }}"
--
GitLab