diff --git a/docs/offline-environment.md b/docs/offline-environment.md
index 60f40be2c22784990a19ed379c434c162f2c895f..23e8a33711b29d44440739978a791acc10a629b1 100644
--- a/docs/offline-environment.md
+++ b/docs/offline-environment.md
@@ -30,12 +30,9 @@ crictl_download_url: "{{ files_repo }}/kubernetes/cri-tools/crictl-{{ crictl_ver
calicoctl_download_url: "{{ files_repo }}/kubernetes/calico/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}"
# CentOS/Redhat
-## Docker
+## Docker / Containerd
docker_rh_repo_base_url: "{{ yum_repo }}/docker-ce/$releasever/$basearch"
docker_rh_repo_gpgkey: "{{ yum_repo }}/docker-ce/gpg"
-## Containerd
-extras_rh_repo_base_url: "{{ yum_repo }}/centos/{{ ansible_distribution_major_version }}/extras/$basearch"
-extras_rh_repo_gpgkey: "{{ yum_repo }}/containerd/gpg"
# Fedora
## Docker
diff --git a/inventory/sample/group_vars/k8s-cluster/offline.yml b/inventory/sample/group_vars/k8s-cluster/offline.yml
index 22f322863e12d357da9dd54881cd15c34c65291a..20b236b634e960dc2923e69c9984cb1dd28e7654 100644
--- a/inventory/sample/group_vars/k8s-cluster/offline.yml
+++ b/inventory/sample/group_vars/k8s-cluster/offline.yml
@@ -34,12 +34,12 @@
# calicoctl_download_url: "{{ files_repo }}/kubernetes/calico/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}"
## CentOS/Redhat
-### Docker
+### For EL7, base and extras repo must be available, for EL8, baseos and appstream
+### By default we enable those repo automatically
+# rhel_enable_repos: false
+### Docker / Containerd
# docker_rh_repo_base_url: "{{ yum_repo }}/docker-ce/$releasever/$basearch"
# docker_rh_repo_gpgkey: "{{ yum_repo }}/docker-ce/gpg"
-### Containerd
-# extras_rh_repo_base_url: "{{ yum_repo }}/centos/$releasever/extras/$basearch"
-# extras_rh_repo_gpgkey: "{{ yum_repo }}/containerd/gpg"
## Fedora
### Docker
diff --git a/roles/bootstrap-os/tasks/bootstrap-redhat.yml b/roles/bootstrap-os/tasks/bootstrap-redhat.yml
index 9170635d474a57cc03823204588465c5df08ce57..5f70010e5afe25d8b93af6126d1e9eb5c31822e7 100644
--- a/roles/bootstrap-os/tasks/bootstrap-redhat.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-redhat.yml
@@ -60,6 +60,28 @@
- rh_subscription_username is defined
- rh_subscription_status.changed
+# container-selinux is in extras repo
+- name: Enable RHEL 7 repos
+ rhsm_repository:
+ name:
+ - "rhel-7-server-rpms"
+ - "rhel-7-server-extras-rpms"
+ state: enabled
+ when:
+ - rhel_enable_repos | default(True)
+ - ansible_distribution_major_version == "7"
+
+# container-selinux is in appstream repo
+- name: Enable RHEL 8 repos
+ rhsm_repository:
+ name:
+ - "rhel-8-for-*-baseos-rpms"
+ - "rhel-8-for-*-appstream-rpms"
+ state: enabled
+ when:
+ - rhel_enable_repos | default(True)
+ - ansible_distribution_major_version == "8"
+
- name: Check presence of fastestmirror.conf
stat:
path: /etc/yum/pluginconf.d/fastestmirror.conf
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index c9f40bc90846a11c7a82b7793dea0becb73e2201..1138f835a4322802e2f25c3d16b43d35e461aa6e 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -34,9 +34,6 @@ containerd_repo_key_info:
containerd_repo_info:
repos:
-extras_rh_repo_base_url: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/"
-extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7"
-
# Ubuntu docker-ce repo
containerd_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
containerd_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
diff --git a/roles/container-engine/containerd/tasks/containerd_repo.yml b/roles/container-engine/containerd/tasks/containerd_repo.yml
index 64c360d1b84250fee0e95b2a9d981b1a18dc8f77..29b26afb581083ea6a6f72ca4424301a41d6f578 100644
--- a/roles/container-engine/containerd/tasks/containerd_repo.yml
+++ b/roles/container-engine/containerd/tasks/containerd_repo.yml
@@ -30,24 +30,3 @@
src: "rh_containerd.repo.j2"
dest: "{{ yum_repo_dir }}/containerd.repo"
when: ansible_distribution in ["CentOS","RedHat"]
-
-- name: check if container-selinux is available
- yum:
- list: "container-selinux"
- register: yum_result
- when: ansible_distribution in ["CentOS","RedHat"]
-
-- name: Configure extras repository on RedHat/CentOS if container-selinux is not available in current repos
- yum_repository:
- name: extras
- description: "CentOS-{{ ansible_distribution_major_version }} - Extras"
- state: present
- baseurl: "{{ extras_rh_repo_base_url }}"
- file: "extras"
- gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}"
- gpgkey: "{{ extras_rh_repo_gpgkey }}"
- keepcache: "{{ containerd_rpm_keepcache | default('1') }}"
- proxy: " {{ http_proxy | default('_none_') }}"
- when:
- - ansible_distribution in ["CentOS","RedHat"]
- - yum_result.results | length == 0
diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index d99af24b4e64d0ebf55a7ebd28c3f9b3859d6148..64e9f06b9b1665160a46f8126b3cf34b84d13ddf 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/roles/container-engine/docker/defaults/main.yml
@@ -32,9 +32,6 @@ docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
docker_bin_dir: "/usr/bin"
-# CentOS/RedHat Extras repo
-extras_rh_repo_base_url: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/"
-extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7"
# flag to enable/disable docker cleanup
docker_orphan_clean_up: false
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index ce7b39480ebd25231450b6a3cd9b517b8433137d..413acd6df8022ba509fce00c73343941c8def1e9 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -85,27 +85,6 @@
dest: "{{ yum_repo_dir }}/docker-ce.repo"
when: ansible_distribution in ["CentOS","RedHat","OracleLinux"] and not is_ostree
-- name: check if container-selinux is available
- yum:
- list: "container-selinux"
- register: yum_result
- when: ansible_distribution in ["CentOS","RedHat"] and not is_ostree
-
-- name: Configure extras repository on RedHat/CentOS if container-selinux is not available in current repos
- yum_repository:
- name: extras
- description: "CentOS-{{ ansible_distribution_major_version }} - Extras"
- state: present
- baseurl: "{{ extras_rh_repo_base_url }}"
- file: "extras"
- gpgcheck: "{{ 'yes' if extras_rh_repo_gpgkey else 'no' }}"
- gpgkey: "{{ extras_rh_repo_gpgkey }}"
- keepcache: "{{ docker_rpm_keepcache | default('1') }}"
- proxy: " {{ http_proxy | default('_none_') }}"
- when:
- - ansible_distribution in ["CentOS","RedHat"] and not is_ostree
- - yum_result.results | length == 0
-
- name: Remove dpkg hold
dpkg_selections:
name: "{{ item }}"