openstack/devstack
Code Issues Proposed changes

Merge "Add EPEL-7 repo for RHEL7"

Browse Source
This commit is contained in:
Jenkins 2014-04-11 03:14:12 +00:00 committed by Gerrit Code Review
commit 2e2b09264f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stack.sh
View File

@ -215,21 +215,24 @@ if [[ "$os_VENDOR" =~ (Debian) ]]; then
apt_get install --force-yes gplhost-archive-keyring apt_get install --force-yes gplhost-archive-keyring
fi fi
if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then if [[ is_fedora && $DISTRO =~ (rhel) ]]; then
# Installing Open vSwitch on RHEL6 requires enabling the RDO repo. # Installing Open vSwitch on RHEL requires enabling the RDO repo.
RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack-havana/rdo-release-havana.rpm"} RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack-icehouse/rdo-release-icehouse.rpm"}
RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-havana"} RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-icehouse"}
if ! sudo yum repolist enabled $RHEL6_RDO_REPO_ID | grep -q $RHEL6_RDO_REPO_ID; then if ! sudo yum repolist enabled $RHEL6_RDO_REPO_ID | grep -q $RHEL6_RDO_REPO_ID; then
echo "RDO repo not detected; installing" echo "RDO repo not detected; installing"
yum_install $RHEL6_RDO_REPO_RPM || \ yum_install $RHEL6_RDO_REPO_RPM || \
die $LINENO "Error installing RDO repo, cannot continue" die $LINENO "Error installing RDO repo, cannot continue"
fi fi
# RHEL requires EPEL for many Open Stack dependencies
# RHEL6 requires EPEL for many Open Stack dependencies if [[ $DISTRO =~ (rhel7) ]]; then
RHEL6_EPEL_RPM=${RHEL6_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"} EPEL_RPM=${RHEL7_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.1.noarch.rpm"}
else
EPEL_RPM=${RHEL6_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"}
fi
if ! sudo yum repolist enabled epel | grep -q 'epel'; then if ! sudo yum repolist enabled epel | grep -q 'epel'; then
echo "EPEL not detected; installing" echo "EPEL not detected; installing"
yum_install ${RHEL6_EPEL_RPM} || \ yum_install ${EPEL_RPM} || \
die $LINENO "Error installing EPEL repo, cannot continue" die $LINENO "Error installing EPEL repo, cannot continue"
fi fi