Merge "Bump EPEL release rpm for RHEL 7 to 7.0-2"

This commit is contained in:
Jenkins 2014-06-24 18:00:41 +00:00 committed by Gerrit Code Review
commit c6dc3deb25

View File

@ -239,7 +239,7 @@ if [[ is_fedora && $DISTRO =~ (rhel) ]]; then
fi fi
# RHEL requires EPEL for many Open Stack dependencies # RHEL requires EPEL for many Open Stack dependencies
if [[ $DISTRO =~ (rhel7) ]]; then if [[ $DISTRO =~ (rhel7) ]]; then
EPEL_RPM=${RHEL7_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.1.noarch.rpm"} EPEL_RPM=${RHEL7_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.2.noarch.rpm"}
else else
EPEL_RPM=${RHEL6_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"} EPEL_RPM=${RHEL6_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"}
fi fi