Use the rdo havana repo with the RHEL family

In devstack viewpoint there is not too much differences at the moment.
But using the grizzly named repo close to havana release, was strange to me.

Switching to the repo link which does not have a version like '-3'.

Change-Id: Ib421d50d19baeeeff264aa0cb9c105fffcf572f8
This commit is contained in:
Attila Fazekas 2013-09-27 07:45:56 +02:00
parent 4c2870b64a
commit dc0bd1a886

View File

@ -150,8 +150,8 @@ fi
if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
# Installing Open vSwitch on RHEL6 requires enabling the RDO repo. # Installing Open vSwitch on RHEL6 requires enabling the RDO repo.
RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack/openstack-grizzly/rdo-release-grizzly-3.noarch.rpm"} RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack-havana/rdo-release-havana.rpm"}
RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-grizzly"} RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-havana"}
if ! yum repolist enabled $RHEL6_RDO_REPO_ID | grep -q $RHEL6_RDO_REPO_ID; then if ! 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 || \