Manage containerd.io package with docker CRI. (#6218)

* Manage containerd.io package with docker CRI.

* Refactor common containerd stuff to separate role

* Fix check mode and unnecessary shell.
This commit is contained in:
Lovro Seder
2020-06-05 14:55:44 +02:00
committed by GitHub
parent 764a851189
commit 5dd85197af
22 changed files with 90 additions and 50 deletions

View File

@@ -11,9 +11,6 @@ containerd_config:
# containerd:
# snapshotter: native
containerd_version: '1.2.13'
containerd_package: 'containerd.io'
containerd_cfg_dir: /etc/containerd
# Path to runc binary

View File

@@ -0,0 +1,3 @@
---
dependencies:
- role: container-engine/containerd-common

View File

@@ -22,12 +22,13 @@
delegate_to: "{{ inventory_hostname }}"
- name: Get crictl completion
shell: "{{ bin_dir }}/crictl completion"
command: "{{ bin_dir }}/crictl completion"
changed_when: False
register: cri_completion
check_mode: False
- name: Install crictl completion
copy:
dest: /etc/bash_completion.d/crictl
content: "{{ cri_completion.stdout }}"
become: True
become: True

View File

@@ -1,16 +1,4 @@
---
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.4': "{{ containerd_package }}=1.2.4-1"
'1.2.5': "{{ containerd_package }}=1.2.5-1"
'1.2.6': "{{ containerd_package }}=1.2.6-3"
'1.2.10': "{{ containerd_package }}=1.2.10-3"
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ containerd_package }}=1.2.13-2"
'stable': "{{ containerd_package }}=1.2.13-2"
'edge': "{{ containerd_package }}=1.2.13-2"
containerd_package_info:
pkg_mgr: apt
pkgs:

View File

@@ -1,13 +1,4 @@
---
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.10': "{{ containerd_package }}-1.2.10-3.2.fc{{ ansible_distribution_major_version }}"
'1.2.12': "{{ containerd_package }}-1.2.12-3.2.fc{{ ansible_distribution_major_version }}"
'1.2.13': "{{ containerd_package }}-1.2.13-3.2.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.2.13-3.2.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.2.13-3.2.fc{{ ansible_distribution_major_version }}"
containerd_package_info:
pkg_mgr: dnf
pkgs:

View File

@@ -1,16 +1,4 @@
---
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.4': "{{ containerd_package }}-1.2.4-3.1.el7"
'1.2.5': "{{ containerd_package }}-1.2.5-3.1.el7"
'1.2.6': "{{ containerd_package }}-1.2.6-3.3.el7"
'1.2.10': "{{ containerd_package }}-1.2.10-3.2.el7"
'1.2.12': "{{ containerd_package }}-1.2.12-3.1.el7"
'1.2.13': "{{ containerd_package }}-1.2.13-3.2.el7"
'stable': "{{ containerd_package }}-1.2.13-3.2.el7"
'edge': "{{ containerd_package }}-1.2.13-3.2.el7"
containerd_package_info:
pkg_mgr: yum
pkgs:

View File

@@ -1,16 +1,4 @@
---
containerd_versioned_pkg:
'latest': "{{ containerd_package }}"
'1.2.4': "{{ containerd_package }}=1.2.4-1"
'1.2.5': "{{ containerd_package }}=1.2.5-1"
'1.2.6': "{{ containerd_package }}=1.2.6-3"
'1.2.10': "{{ containerd_package }}=1.2.10-3"
'1.2.12': "{{ containerd_package }}=1.2.12-1"
'1.2.13': "{{ containerd_package }}=1.2.13-2"
'stable': "{{ containerd_package }}=1.2.13-2"
'edge': "{{ containerd_package }}=1.2.13-2"
containerd_package_info:
pkg_mgr: apt
pkgs: