aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 14:31:36 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 14:31:36 +0000
commit937796805b9d64665c84b47808a692fb8b1056c7 (patch)
tree2c79754d2002264f05937f86f1d29f9ae97831fe /docker
parent66014b50753f27d2b7dc6d864840f6d677636c34 (diff)
parent15c2b0fa679de331306a02ca249baa0705d0bd01 (diff)
downloadkolla-937796805b9d64665c84b47808a692fb8b1056c7.tar.gz
kolla-937796805b9d64665c84b47808a692fb8b1056c7.zip
Merge "Fix the order of the RHEL 7 server optional repository"
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index af353a269..803bd5f4b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -164,10 +164,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
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 \
&& yum -y install \
yum-plugin-priorities \
&& yum clean all \
- && yum-config-manager --enable rhel-7-server-optional-rpms \
&& 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 \