openstack/devstack
Code Issues Proposed changes

Merge "Fixed conditions to determine if current distribution is a Fedora based distribution"

Browse Source
This commit is contained in:
Jenkins 2014-11-19 05:28:35 +00:00 committed by Gerrit Code Review
commit dcffc70b67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -212,7 +212,7 @@ fi
# Some distros need to add repos beyond the defaults provided by the vendor # Some distros need to add repos beyond the defaults provided by the vendor
# to pick up required packages. # to pick up required packages.
if [[ is_fedora && $DISTRO == "rhel6" ]]; then if is_fedora && [ $DISTRO == "rhel6" ]; then
# Installing Open vSwitch on RHEL 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-icehouse/rdo-release-icehouse.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-icehouse"} RHEL6_RDO_REPO_ID=${RHEL6_RDO_REPO_ID:-"openstack-icehouse"}
@ -223,7 +223,7 @@ if [[ is_fedora && $DISTRO == "rhel6" ]]; then
fi fi
fi fi
if [[ is_fedora && ( $DISTRO == "rhel6" || $DISTRO == "rhel7" ) ]]; then if is_fedora && [[ $DISTRO == "rhel6" || $DISTRO == "rhel7" ]]; then
# RHEL requires EPEL for many Open Stack dependencies # RHEL requires EPEL for many Open Stack dependencies
# note we always remove and install latest -- some environments # note we always remove and install latest -- some environments
@ -347,7 +347,7 @@ function echo_nolog {
echo $@ >&3 echo $@ >&3
} }
if [[ is_fedora && $DISTRO == "rhel6" ]]; then if is_fedora && [ $DISTRO == "rhel6" ]; then
# poor old python2.6 doesn't have argparse by default, which # poor old python2.6 doesn't have argparse by default, which
# outfilter.py uses # outfilter.py uses
is_package_installed python-argparse || install_package python-argparse is_package_installed python-argparse || install_package python-argparse