Updated from OpenStack Ansible Tests

Change-Id: I24c6a1dcd5076db83737c48d78632010fed02b4e
This commit is contained in:
OpenStack Proposal Bot 2017-08-03 15:27:11 +00:00
parent 383b26228c
commit 6399dd579e

View File

@ -35,9 +35,12 @@ source /etc/os-release || source /usr/lib/os-release
install_pkg_deps() { install_pkg_deps() {
pkg_deps="git" pkg_deps="git"
# Prefer dnf over yum for CentOS.
which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
case ${ID,,} in case ${ID,,} in
*suse*) pkg_mgr_cmd="zypper -n in" ;; *suse*) pkg_mgr_cmd="zypper -n in" ;;
centos|rhel) pkg_mgr_cmd="yum install -y" ;; centos|rhel) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
fedora) pkg_mgr_cmd="dnf -y install" ;; fedora) pkg_mgr_cmd="dnf -y install" ;;
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;