Source containerd version and allow downgrade (#3170)

hitachienergy · Jun 1, 2022 · f3a2567 · f3a2567
1 parent ff187b6
commit f3a2567
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml
@@ -3,5 +3,6 @@
   apt:
     update_cache: true
     name:
-      - containerd.io  # provides "runc"
+      - containerd.io={{ containerd_defaults.containerd_version }}-*  # provides "runc"
     state: present
+    allow_downgrade: true
diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml
@@ -1,7 +1,8 @@
----
+
 - name: Install containerd.io package for RedHat family
   yum:
     update_cache: true
     name:
-      - containerd.io  # provides "runc"
+      - containerd.io-{{ containerd_defaults.containerd_version }}  # provides "runc"
     state: present
+    allow_downgrade: true
diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/main.yml b/ansible/playbooks/roles/haproxy_runc/tasks/main.yml
@@ -9,6 +9,11 @@
     haproxy_dir: "{{ runc_dir }}/{{ haproxy_service }}"
     haproxy_service_needs_restart: false
 
+- name: Include containerd defaults
+  include_vars:
+    file: roles/containerd/defaults/main.yml
+    name: containerd_defaults
+
 - name: Install required system packages
   include_tasks: "install-packages-{{ ansible_os_family }}.yml"
 

diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md
@@ -7,6 +7,10 @@
 - [#2932](https://github.com/epiphany-platform/epiphany/issues/2932) - Support `epicli upgrade` for RHEL/AlmaLinux 8
 - [#3057](https://github.com/epiphany-platform/epiphany/issues/3057) - Additional AWS authentication option
 
+### Fixed
+
+- [#3164](https://github.com/epiphany-platform/epiphany/issues/3164) - Specify version and allow containerd.io package downgrade in haproxy_runc role
+
 ### Updated
 
 - [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch