openstack/kolla
Code Issues Proposed changes

Remove EPEL for RDO of RHEL

Browse Source 
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 <mhban@samsung.com>
This commit is contained in:
Minho Ban 2018-04-16 19:29:19 +09:00 committed by Jon Schlueter
parent cc8e8c9f02
commit bc3f283f18
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/base/Dockerfile.j2
View File

@ -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 \