From 176df83e02e6fb2027a4fca5e093dacf665deaba Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Mon, 15 Feb 2021 23:51:07 -0500 Subject: [PATCH] Fixup cri-o metacopy mount options (#7287) Ubuntu 18.04 crio package ships with 'mountopt = "nodev,metacopy=on"' even if GA kernel is 4.15 (HWE Kernel can be more recent) Fedora package ships without metacopy=on Signed-off-by: Etienne Champetier (cherry picked from commit 5c04bdd52bdb6115fb06bdd31b9862427dcef2e2) --- roles/container-engine/cri-o/tasks/main.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml index 4139af9f4..63a5e4018 100644 --- a/roles/container-engine/cri-o/tasks/main.yaml +++ b/roles/container-engine/cri-o/tasks/main.yaml @@ -134,15 +134,13 @@ owner: root mode: 0755 -- name: Remove metacopy mount options for older kernels +# metacopy=on is available since 4.19 and was backported to RHEL 4.18 kernel +- name: Set metacopy mount options correctly ini_file: dest: /etc/containers/storage.conf section: storage.options.overlay option: mountopt - value: "\"nodev\"" - when: - - ansible_distribution == "CentOS" - - ansible_distribution_major_version == "7" + value: '{{ ''"nodev"'' if ansible_kernel is version_compare(("4.18" if ansible_os_family == "RedHat" else "4.19"), "<") else ''"nodev,metacopy=on"'' }}' - name: Create directory registries configs file: