openstack/devstack
Code Issues Proposed changes

Merge "Allow use of dnf instead of yum on Fedora"

Browse Source
This commit is contained in:
Jenkins 2014-12-11 14:26:10 +00:00 committed by Gerrit Code Review
commit 5f953dd1fe
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions-common
View File

@ -1162,7 +1162,7 @@ function uninstall_package {
if is_ubuntu; then if is_ubuntu; then
apt_get purge "$@" apt_get purge "$@"
elif is_fedora; then elif is_fedora; then
sudo yum remove -y "$@" sudo $YUM remove -y "$@" ||:
elif is_suse; then elif is_suse; then
sudo zypper rm "$@" sudo zypper rm "$@"
else else
@ -1171,7 +1171,7 @@ function uninstall_package {
} }
# Wrapper for ``yum`` to set proxy environment variables # Wrapper for ``yum`` to set proxy environment variables
# Uses globals ``OFFLINE``, ``*_proxy`` # Uses globals ``OFFLINE``, ``*_proxy``, ``YUM``
# yum_install package [package ...] # yum_install package [package ...]
function yum_install { function yum_install {
[[ "$OFFLINE" = "True" ]] && return [[ "$OFFLINE" = "True" ]] && return
@ -1183,7 +1183,7 @@ function yum_install {
# https://bugzilla.redhat.com/show_bug.cgi?id=965567 # https://bugzilla.redhat.com/show_bug.cgi?id=965567
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \ $sudo http_proxy=$http_proxy https_proxy=$https_proxy \
no_proxy=$no_proxy \ no_proxy=$no_proxy \
yum install -y "$@" 2>&1 | \ $YUM install -y "$@" 2>&1 | \
awk ' awk '
BEGIN { fail=0 } BEGIN { fail=0 }
/No package/ { fail=1 } /No package/ { fail=1 }
@ -1193,7 +1193,7 @@ function yum_install {
# also ensure we catch a yum failure # also ensure we catch a yum failure
if [[ ${PIPESTATUS[0]} != 0 ]]; then if [[ ${PIPESTATUS[0]} != 0 ]]; then
die $LINENO "Yum install failure" die $LINENO "$YUM install failure"
fi fi
} }

6
stackrc
View File

@ -639,6 +639,12 @@ API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}
# Service startup timeout # Service startup timeout
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60} SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
# Support alternative yum -- in future Fedora 'dnf' will become the
# only supported installer, but for now 'yum' and 'dnf' are both
# available in parallel with compatible CLIs. Allow manual switching
# till we get to the point we need to handle this automatically
YUM=${YUM:-yum}
# Following entries need to be last items in file # Following entries need to be last items in file
# Local variables: # Local variables: