From 0ae1e7bf9eeb77ac1a26258c1397d7f824024640 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 24 Sep 2020 16:55:49 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I337109a34e4caeb1a848071a0e186a59bead13fd
---
 Vagrantfile  | 4 ++--
 run_tests.sh | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index bf2400c1..7691c3cc 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,8 +31,8 @@ Vagrant.configure(2) do |config|
          ./run_tests.sh
       SHELL
 
-  config.vm.define "centos7" do |centos7|
-    centos7.vm.box = "centos/7"
+  config.vm.define "centos8" do |centos8|
+    centos8.vm.box = "centos/8"
   end
 
   config.vm.define "debian8" do |debian8|
diff --git a/run_tests.sh b/run_tests.sh
index 3129599c..93e91dde 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -51,13 +51,10 @@ fi
 # Source distribution information
 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
 case ${ID,,} 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" ;;
     # Gentoo needs to have version set since it's rolling
     gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;