commit 43bc5fec3bb698f51ad6d882522399c8e247ed61
Author: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date:   Mon Oct 5 17:15:02 2020 +0000

    Updated from OpenStack Ansible Tests
    
    Change-Id: I141b9efc3802a6f0a15adfef190c829775a64be5

diff --git a/Vagrantfile b/Vagrantfile
index 2dbcc20..7691c3c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,7 +31,15 @@ Vagrant.configure(2) do |config|
          ./run_tests.sh
       SHELL
 
-  config.vm.define "debian10" do |debian10|
+  config.vm.define "centos8" do |centos8|
+    centos8.vm.box = "centos/8"
+  end
+
+  config.vm.define "debian8" do |debian8|
+    debian8.vm.box = "debian/jessie64"
+  end
+
+  config.vm.define "debian9" do |debian9|
     debian9.vm.box = "debian/stretch64"
   end
 
@@ -39,13 +47,16 @@ Vagrant.configure(2) do |config|
     gentoo.vm.box = "generic/gentoo"
   end
 
-  config.vm.define "ubuntu1804" do |bionic|
-    bionic.disksize.size = "40GB"
-    bionic.vm.box = "ubuntu/bionic64"
+  config.vm.define "opensuse150" do |leap150|
+    leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
+  end
+
+  config.vm.define "opensuse151" do |leap151|
+    leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
   end
 
-  config.vm.define "ubuntu2004" do |focal|
+  config.vm.define "ubuntu1804" do |bionic|
     bionic.disksize.size = "40GB"
-    bionic.vm.box = "ubuntu/focal64"
+    bionic.vm.box = "ubuntu/bionic64"
   end
 end
diff --git a/bindep.txt b/bindep.txt
index a72962a..bb77692 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -26,12 +26,25 @@
 gcc
 
 # Base requirements for Ubuntu
-git-core          [platform:dpkg]
+git-core          [platform:dpkg platform:suse]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
 python3           [platform:dpkg]
 python3-apt       [platform:dpkg]
 python3-dev       [platform:dpkg]
 
+# Base requirements for RPM distros
+gcc-c++           [platform:rpm]
+git               [platform:rpm !platform:suse]
+libffi-devel      [platform:rpm]
+openssl-devel     [platform:rpm]
+python3-dnf       [platform:fedora]
+python3-devel     [platform:rpm]
+
 # Base requirements for Gentoo
 git               [platform:gentoo]
+
+# For SELinux
+libselinux-python3  [platform:redhat]
+libsemanage-python3 [platform:redhat]
+iptables [platform:redhat]
diff --git a/run_tests.sh b/run_tests.sh
index 3129599..93e91dd 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" ;;