Ensure Open vSwitch can be installed on RHEL6.
* RHEL6 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 RHEL6. * The openvswitch package is now listed as an rpm dependency to ensure it can be cached by a pre-built CI environment. Change-Id: I8f93f53039cca4ff29bcb91720be7bb047b3ed8a
This commit is contained in:
parent
d52008acd4
commit
eb2da5dfb8
@ -4,6 +4,7 @@ ebtables
|
|||||||
iptables
|
iptables
|
||||||
iputils
|
iputils
|
||||||
mysql-server # NOPRIME
|
mysql-server # NOPRIME
|
||||||
|
openvswitch # NOPRIME
|
||||||
python-boto
|
python-boto
|
||||||
python-eventlet
|
python-eventlet
|
||||||
python-greenlet
|
python-greenlet
|
||||||
|
17
stack.sh
17
stack.sh
@ -32,6 +32,12 @@ source $TOP_DIR/functions
|
|||||||
# and ``DISTRO``
|
# and ``DISTRO``
|
||||||
GetDistro
|
GetDistro
|
||||||
|
|
||||||
|
|
||||||
|
# Configure non-default repos
|
||||||
|
# ===========================
|
||||||
|
|
||||||
|
# Repo configuration needs to occur before package installation.
|
||||||
|
|
||||||
# Some dependencies are not available in Debian Wheezy official
|
# Some dependencies are not available in Debian Wheezy official
|
||||||
# repositories. However, it's possible to run OpenStack from gplhost
|
# repositories. However, it's possible to run OpenStack from gplhost
|
||||||
# repository.
|
# repository.
|
||||||
@ -42,6 +48,17 @@ if [[ "$os_VENDOR" =~ (Debian) ]]; then
|
|||||||
apt_get install --force-yes gplhost-archive-keyring
|
apt_get install --force-yes gplhost-archive-keyring
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 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_ID=${RHEL6_RDO_REPO_ID:-"openstack-grizzly"}
|
||||||
|
if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
|
||||||
|
if ! 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
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Global Settings
|
# Global Settings
|
||||||
# ===============
|
# ===============
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user