Updated from OpenStack Ansible Tests

Change-Id: I26b3223b2c7d4d1cb4e362c1907bbe0a072a35eb
This commit is contained in:
OpenStack Proposal Bot 2020-09-24 17:00:17 +00:00
parent 7461a113ad
commit 4ad5f5f269
2 changed files with 3 additions and 6 deletions

4
Vagrantfile vendored
View File

@ -31,8 +31,8 @@ Vagrant.configure(2) do |config|
./run_tests.sh ./run_tests.sh
SHELL SHELL
config.vm.define "centos7" do |centos7| config.vm.define "centos8" do |centos8|
centos7.vm.box = "centos/7" centos8.vm.box = "centos/8"
end end
config.vm.define "debian8" do |debian8| config.vm.define "debian8" do |debian8|

View File

@ -51,13 +51,10 @@ fi
# Source distribution information # Source distribution information
source /etc/os-release || source /usr/lib/os-release source /etc/os-release || source /usr/lib/os-release
# Prefer dnf over yum for CentOS.
which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
# Figure out the appropriate package install command # Figure out the appropriate package install command
case ${ID,,} in case ${ID,,} in
*suse*) pkg_mgr_cmd="zypper -n in" ;; *suse*) pkg_mgr_cmd="zypper -n in" ;;
centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;; centos|rhel|fedora) pkg_mgr_cmd="dnf install -y" ;;
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
# Gentoo needs to have version set since it's rolling # Gentoo needs to have version set since it's rolling
gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;; gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;