C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Run containerd related tasks on OracleLinux. (#7250)

Browse source 
(cherry picked from commit fc8551bcba)
This commit is contained in:
petruha 2021-02-05 09:46:52 +01:00 committed by Kubernetes Prow Robot
parent 960844d87b
commit 754a54adfc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/container-engine/containerd/tasks/containerd_repo.yml
View file

@ -25,8 +25,8 @@
dest: "{{ yum_repo_dir }}/containerd.repo" dest: "{{ yum_repo_dir }}/containerd.repo"
when: ansible_distribution == "Fedora" when: ansible_distribution == "Fedora"
- name: Configure containerd repository on RedHat/CentOS - name: Configure containerd repository on RedHat/OracleLinux/CentOS
template: template:
src: "rh_containerd.repo.j2" src: "rh_containerd.repo.j2"
dest: "{{ yum_repo_dir }}/containerd.repo" dest: "{{ yum_repo_dir }}/containerd.repo"
when: ansible_distribution in ["CentOS","RedHat"] when: ansible_distribution in ["CentOS", "OracleLinux", "RedHat"]

2
roles/container-engine/containerd/tasks/main.yml
View file

@ -13,7 +13,7 @@
fail: fail:
msg: "{{ ansible_distribution }} is not supported by containerd." msg: "{{ ansible_distribution }} is not supported by containerd."
when: 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 - name: gather os specific variables
include_vars: "{{ item }}" include_vars: "{{ item }}"