From 35e734f890c1c86cf3b4489d00a5f5d4b1bd2aca Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Tue, 8 Aug 2017 13:30:17 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I80901f60974e894b55c5e949e20e3b646062d54f
---
 Vagrantfile  | 4 ++++
 bindep.txt   | 6 ++++--
 run_tests.sh | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 46436cf..7d8c27a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -36,6 +36,10 @@ Vagrant.configure(2) do |config|
     leap422.vm.box = "opensuse/openSUSE-42.2-x86_64"
   end
 
+  config.vm.define "opensuse423" do |leap423|
+    leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
+  end
+
   config.vm.define "centos7" do |centos7|
     centos7.vm.box = "centos/7"
   end
diff --git a/bindep.txt b/bindep.txt
index f2924a2..d3ead94 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -30,6 +30,9 @@ libffi-dev        [platform:dpkg]
 python2.7         [platform:dpkg]
 python-apt        [platform:dpkg]
 python-dev        [platform:dpkg]
+python3           [platform:dpkg]
+python3-apt       [platform:dpkg]
+python3-dev       [platform:dpkg]
 
 # Base requirements for RPM distros
 gcc               [platform:rpm]
@@ -51,8 +54,7 @@ python-pyasn1               [platform:dpkg platform:suse]
 python-openssl              [platform:dpkg]
 python-ndg-httpsclient      [platform:ubuntu !platform:ubuntu-14]
 python2-pyasn1              [platform:redhat]
-python2-pyOpenSSL           [platform:redhat !platform:fedora]
-pyOpenSSL                   [platform:fedora]
+pyOpenSSL                   [platform:redhat]
 python-pyOpenSSL            [platform:opensuseproject-42]
 python2-pyOpenSSL           [platform:suse !platform:opensuseproject-42]
 python-ndg_httpsclient      [platform:redhat !platform:fedora]
diff --git a/run_tests.sh b/run_tests.sh
index 969e3db..e8f6f3a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -35,9 +35,12 @@ source /etc/os-release || source /usr/lib/os-release
 install_pkg_deps() {
     pkg_deps="git"
 
+    # Prefer dnf over yum for CentOS.
+    which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
+
     case ${ID,,} 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" ;;
         ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
         *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;