diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index fb719878d..b66c9124a 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -44,6 +44,9 @@ dockerproject_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg' dockerproject_apt_repo_base_url: 'https://apt.dockerproject.org/repo' dockerproject_apt_repo_gpgkey: 'https://apt.dockerproject.org/gpg' docker_bin_dir: "/usr/bin" +# CentOS/RedHat Extras repo +extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/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 c1f501838..8dde643d4 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -109,6 +109,27 @@ dest: "{{ yum_repo_dir }}/docker.repo" when: ansible_distribution in ["CentOS","RedHat"] and not is_atomic +- name: check if container-selinux is available + yum: + list: "container-selinux" + register: yum_result + when: ansible_distribution in ["CentOS","RedHat"] and not is_atomic + +- name: Configure extras repository on RedHat/CentOS if container-selinux not avaiable in current repos + yum_repository: + name: extras + description: "CentOS-7 - Extras" + state: present + baseurl: "{{ extras_rh_repo_base_url }}" + file: "extras" + gpgcheck: yes + gpgkey: "{{extras_rh_repo_gpgkey}}" + keepcache: "{{ docker_rpm_keepcache | default('1') }}" + proxy: " {{ http_proxy | default(omit) }}" + when: + - ansible_distribution in ["CentOS","RedHat"] and not is_atomic + - yum_result.results | length == 0 + - name: Copy yum.conf for editing copy: src: "{{ yum_conf }}"