From 5a3c1d3c29f890d587d648a211ec332ac47064d1 Mon Sep 17 00:00:00 2001 From: Kay Yan Date: Mon, 13 May 2024 22:39:33 +0800 Subject: [PATCH] fix-container-selinux-amzn-linux (#11182) --- roles/bootstrap-os/tasks/amzn.yml | 3 +++ roles/container-engine/cri-o/tasks/setup-amazon.yaml | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/roles/bootstrap-os/tasks/amzn.yml b/roles/bootstrap-os/tasks/amzn.yml index 2b4d665d3bc..0da5591caa3 100644 --- a/roles/bootstrap-os/tasks/amzn.yml +++ b/roles/bootstrap-os/tasks/amzn.yml @@ -1,4 +1,7 @@ --- +- name: Enable selinux-ng repo for Amazon Linux for container-selinux + command: amazon-linux-extras enable selinux-ng + - name: Enable EPEL repo for Amazon Linux yum_repository: name: epel diff --git a/roles/container-engine/cri-o/tasks/setup-amazon.yaml b/roles/container-engine/cri-o/tasks/setup-amazon.yaml index 843bc202964..e6e099d65fb 100644 --- a/roles/container-engine/cri-o/tasks/setup-amazon.yaml +++ b/roles/container-engine/cri-o/tasks/setup-amazon.yaml @@ -24,15 +24,3 @@ when: - amzn2_extras_file_stat.stat.exists - not amzn2_extras_docker_repo.changed - -- name: Add container-selinux yum repo - yum_repository: - name: copr:copr.fedorainfracloud.org:lsm5:container-selinux - file: _copr_lsm5-container-selinux.repo - description: Copr repo for container-selinux owned by lsm5 - baseurl: https://download.copr.fedorainfracloud.org/results/lsm5/container-selinux/epel-7-$basearch/ - gpgcheck: yes - gpgkey: https://download.copr.fedorainfracloud.org/results/lsm5/container-selinux/pubkey.gpg - skip_if_unavailable: yes - enabled: yes - repo_gpgcheck: no