From bc3f283f189bbe65f97ab759c97ea24a128d6ebc Mon Sep 17 00:00:00 2001 From: Minho Ban Date: Mon, 16 Apr 2018 19:29:19 +0900 Subject: Remove EPEL for RDO of RHEL Since Ocata, it has been recommended to disable EPEL when using RDO because of breaking backward compatibility. https://docs.openstack.org/ocata/install-guide-rdo/environment-packages.html There seems to be no special reason to use EPEL in case of RHEL. Change-Id: Iadc351dac518c03163811aab4dfeee7ad0457687 Signed-off-by: Minho Ban --- docker/base/Dockerfile.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c48705dbc..b41749b83 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -156,12 +156,14 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% block base_rhel_package_installation %} # Enable couple required repositories for all RHEL builds # Turn on EPEL throughout the build -RUN yum -y install \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ - && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ - && yum-config-manager --enable rhel-7-server-optional-rpms \ +RUN yum-config-manager --enable rhel-7-server-optional-rpms \ && yum -y install \ yum-plugin-priorities \ + {% if install_type != 'binary' or install_metatype != 'rdo' %} + && yum -y install \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ + {% endif %} && yum-config-manager --enable rhel-7-server-extras-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-osd-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \ -- cgit v1.2.3