Install Juno RDO repos for RHEL7
RHEL7 does not include Open vSwitch in the default repos, but it is available via the RDO repo. This patch automatically configures the RDO repo for RHEL7. Move this into the existing rhel6/rhel7 section. We update RHEl6 to the latest icehouse release, but it is not supported with Juno Closes-Bug: #1402390 Change-Id: I4707cf68e39d9e900ec6c01331d7e124c8c4f6c4
This commit is contained in:
parent
7f80280698
commit
fc99426a90
28
stack.sh
28
stack.sh
@ -212,17 +212,6 @@ fi
|
||||
# Some distros need to add repos beyond the defaults provided by the vendor
|
||||
# to pick up required packages.
|
||||
|
||||
if is_fedora && [ $DISTRO == "rhel6" ]; then
|
||||
# Installing Open vSwitch on RHEL requires enabling the RDO repo.
|
||||
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-icehouse"}
|
||||
if ! sudo yum repolist enabled $RHEL6_RDO_REPO_ID | grep -q $RHEL6_RDO_REPO_ID; then
|
||||
echo "RDO repo not detected; installing"
|
||||
yum_install $RHEL6_RDO_REPO_RPM || \
|
||||
die $LINENO "Error installing RDO repo, cannot continue"
|
||||
fi
|
||||
fi
|
||||
|
||||
if is_fedora && [[ $DISTRO == "rhel6" || $DISTRO == "rhel7" ]]; then
|
||||
# RHEL requires EPEL for many Open Stack dependencies
|
||||
|
||||
@ -269,6 +258,23 @@ EOF
|
||||
OPTIONAL_REPO=rhel-6-server-optional-rpms
|
||||
fi
|
||||
sudo yum-config-manager --enable ${OPTIONAL_REPO}
|
||||
|
||||
# Installing Open vSwitch on RHEL requires enabling the RDO repo.
|
||||
# Note no juno packages for rhel6
|
||||
if [[ $DISTRO == "rhel6" ]]; then
|
||||
RHEL_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm"}
|
||||
RHEL_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-icehouse"}
|
||||
elif [[ $DISTRO == "rhel7" ]]; then
|
||||
RHEL_RDO_REPO_RPM=${RHEL7_RDO_REPO_RPM:-"https://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm"}
|
||||
RHEL_RDO_REPO_ID=${RHEL7_RDO_REPO_ID:-"openstack-juno"}
|
||||
fi
|
||||
|
||||
if ! sudo yum repolist enabled $RHEL_RDO_REPO_ID | grep -q $RHEL_RDO_REPO_ID; then
|
||||
echo "RDO repo not detected; installing"
|
||||
yum_install $RHEL_RDO_REPO_RPM || \
|
||||
die $LINENO "Error installing RDO repo, cannot continue"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user