From 74e8f58c57041a7c45147f07c85c8bccc01540c5 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Fri, 8 Jan 2021 17:29:43 -0500 Subject: [PATCH] containerd: use copy to set apt pin Signed-off-by: Etienne Champetier (cherry picked from commit 19a61d838f34b0c784740ee55aa7597e8b05100f) --- roles/container-engine/containerd/tasks/main.yml | 11 ++++++----- .../templates/apt_preferences.d/debian_containerd.j2 | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 roles/container-engine/containerd/templates/apt_preferences.d/debian_containerd.j2 diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml index f139fa75f..7b6fb0d8e 100644 --- a/roles/container-engine/containerd/tasks/main.yml +++ b/roles/container-engine/containerd/tasks/main.yml @@ -81,14 +81,15 @@ # This is required to ensure any apt upgrade will not break kubernetes - name: Set containerd pin priority to apt_preferences on Debian family - template: - src: "apt_preferences.d/debian_containerd.j2" + copy: + content: | + Package: {{ containerd_package }} + Pin: version {{ containerd_version }}* + Pin-Priority: 1001 dest: "/etc/apt/preferences.d/containerd" owner: "root" mode: 0644 - when: - - ansible_os_family in ['Ubuntu', 'Debian'] - - not is_ostree + when: ansible_pkg_mgr == 'apt' - name: ensure containerd packages are installed action: "{{ containerd_package_info.pkg_mgr }}" diff --git a/roles/container-engine/containerd/templates/apt_preferences.d/debian_containerd.j2 b/roles/container-engine/containerd/templates/apt_preferences.d/debian_containerd.j2 deleted file mode 100644 index 5299573b3..000000000 --- a/roles/container-engine/containerd/templates/apt_preferences.d/debian_containerd.j2 +++ /dev/null @@ -1,3 +0,0 @@ -Package: {{ containerd_package }} -Pin: version {{ containerd_version }}* -Pin-Priority: 1001