Updated from OpenStack Ansible Tests

Change-Id: If033c4515dc06de31e7014889391bd614b614357
This commit is contained in:
OpenStack Proposal Bot 2017-12-06 00:06:44 +00:00
parent 9de4f4a9ba
commit ded74a98d7
2 changed files with 6 additions and 8 deletions

View File

@ -22,8 +22,10 @@
# using this file.
#
# The gcc compiler
gcc
# Base requirements for Ubuntu
gcc [platform:dpkg]
git-core [platform:dpkg]
libssl-dev [platform:dpkg]
libffi-dev [platform:dpkg]
@ -35,13 +37,10 @@ python3-apt [platform:dpkg]
python3-dev [platform:dpkg]
# Base requirements for RPM distros
gcc [platform:rpm]
gcc-c++ [platform:rpm]
git [platform:rpm]
libffi-devel [platform:rpm !platform:opensuseproject-42]
libffi-devel-gcc5 [platform:opensuseproject-42]
openssl-devel [platform:redhat]
libopenssl-devel [platform:suse]
libffi-devel [platform:rpm]
openssl-devel [platform:rpm]
python-devel [platform:rpm]
python2-dnf [platform:fedora]

View File

@ -40,8 +40,7 @@ install_pkg_deps() {
case ${ID,,} in
*suse*) pkg_mgr_cmd="zypper -n in" ;;
centos|rhel) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
fedora) pkg_mgr_cmd="dnf -y install" ;;
centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
esac