From 28c710e5e966d1fadf05db0cff63c6e508f183eb Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 22 Jan 2018 16:54:37 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Id59c48a6d01c2d60f6631d0f31a17698e9f62e98
---
 Vagrantfile  |  2 ++
 bindep.txt   | 11 +++++------
 run_tests.sh |  3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7d8c27a0..79d67de4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,6 +20,8 @@ Vagrant.configure(2) do |config|
     v.cpus = 2
   end
 
+  config.vm.synced_folder ".", "/vagrant", type: "rsync"
+
   config.vm.provision "shell",
       privileged: false,
       inline: <<-SHELL
diff --git a/bindep.txt b/bindep.txt
index 812e00c3..5a05c5a4 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -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]
 
diff --git a/run_tests.sh b/run_tests.sh
index d9dacfb8..4b72d3fa 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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