External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-14 17:50:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

containerd,docker: use apt_repository instead of action

Browse Source 
yum_repository expect really different params, so nothing to factor here
Ubuntu is not an ansible_os_family, the OS family for Ubuntu is Debian
Check for ansible_pkg_mgr == apt

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit a8e51e686e)
This commit is contained in:
Etienne Champetier
2021-01-08 16:51:06 -05:00
committed by Kubernetes Prow Robot
parent 5e06ee6ea6
commit b80f612d29
10 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/container-engine/docker/tasks/main.yml
View File

@@ -67,12 +67,11 @@
when: ansible_pkg_mgr == 'apt'
- name: ensure docker-ce repository is enabled
action: "{{ docker_repo_info.pkg_repo }}"
args:
apt_repository:
repo: "{{ item }}"
state: present
with_items: "{{ docker_repo_info.repos }}"
when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (docker_repo_info.repos|length > 0)
when: ansible_pkg_mgr == 'apt'
- name: Configure docker repository on Fedora
template: