openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Ensure epel7 is installed only on rhel7/centos7"

This commit is contained in:
Jenkins 2014-10-08 14:00:12 +00:00 committed by Gerrit Code Review
parent 0f7d9af998 ee001cf4bd
commit 3180c63338
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elements/epel/pre-install.d/05-rpm-epel-release
View File

@ -2,4 +2,8 @@
set -eu
set -o pipefail
yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm
if [[ "rhel7 centos7" =~ "$DISTRO_NAME" ]]; then
yum install -y http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm
elif [[ "rhel" =~ "$DISTRO_NAME" ]]; then
yum install -y http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
fi