diff --git a/roles/container-engine/containerd-common/vars/amazon.yml b/roles/container-engine/containerd-common/vars/amazon.yml new file mode 100644 index 0000000000000000000000000000000000000000..d492fc56ed96b471745d0449296a1a1f3392d934 --- /dev/null +++ b/roles/container-engine/containerd-common/vars/amazon.yml @@ -0,0 +1,9 @@ +--- +containerd_package: containerd +containerd_versioned_pkg: + 'latest': "{{ containerd_package }}" + '1.3.2': "{{ containerd_package }}-1.3.2-1.amzn{{ ansible_distribution_major_version }}" + '1.4.1': "{{ containerd_package }}-1.4.1-2.amzn{{ ansible_distribution_major_version }}" + '1.4.4': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.4.4-1.amzn{{ ansible_distribution_major_version }}" diff --git a/roles/container-engine/containerd/tasks/containerd_repo.yml b/roles/container-engine/containerd/tasks/containerd_repo.yml index 6c4a0470ae097cbf99c03bcddba67b15e32b5462..d62468f0c3e079c5e679af21707bdacaa580faff 100644 --- a/roles/container-engine/containerd/tasks/containerd_repo.yml +++ b/roles/container-engine/containerd/tasks/containerd_repo.yml @@ -31,4 +31,4 @@ dest: "{{ yum_repo_dir }}/containerd.repo" when: - ansible_os_family == "RedHat" - - ansible_distribution != "Fedora" + - ansible_distribution not in ["Fedora", "Amazon"] diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml index fd6811ae5036e2002775a0f5ee2ca90b77500128..5becf1f3d33043351a3a7ffdd6f5ccf83e73f44c 100644 --- a/roles/container-engine/containerd/tasks/main.yml +++ b/roles/container-engine/containerd/tasks/main.yml @@ -16,7 +16,7 @@ fail: msg: "{{ ansible_distribution }} is not supported by containerd." when: - - not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux"] + - not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Amazon"] - name: gather os specific variables include_vars: "{{ item }}" diff --git a/roles/container-engine/containerd/vars/amazon.yml b/roles/container-engine/containerd/vars/amazon.yml new file mode 100644 index 0000000000000000000000000000000000000000..28235ec73fdfb53aadd148c4f6d1cf5b949b7a38 --- /dev/null +++ b/roles/container-engine/containerd/vars/amazon.yml @@ -0,0 +1,5 @@ +--- +containerd_package_info: + enablerepo: "amzn2extra-docker" + pkgs: + - "{{ containerd_versioned_pkg[containerd_version | string] }}"