epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-08 11:07:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor containerd ubuntu setup and remove redundant tasks (#5015)

Browse Source
This commit is contained in:
Johannes Scheuermann
2019-08-05 16:29:48 +02:00
committed by Kubernetes Prow Robot
parent 4132cee687
commit d22634a597
5 changed files with 6 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
roles/container-engine/containerd/tasks/containerd_repo.yml
View File

@@ -36,27 +36,6 @@
- ansible_os_family in ['Ubuntu', 'Debian']
- not is_atomic
- name: ensure containerd repository public key is installed
action: "{{ containerd_repo_key_info.pkg_key }}"
args:
id: "{{ item }}"
url: "{{ containerd_repo_key_info.url }}"
state: present
register: keyserver_task_result
until: keyserver_task_result is succeeded
retries: 4
delay: "{{ retry_stagger | d(3) }}"
with_items: "{{ containerd_repo_key_info.repo_keys }}"
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse", "ClearLinux"] or is_atomic)
- name: ensure containerd repository is enabled
action: "{{ containerd_repo_info.pkg_repo }}"
args:
repo: "{{ item }}"
state: present
with_items: "{{ containerd_repo_info.repos }}"
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse", "ClearLinux"] or is_atomic) and (containerd_repo_info.repos|length > 0)
- name: Configure containerd repository on Fedora
template:
src: "fedora_containerd.repo.j2"