Merge "Updated from OpenStack Ansible Tests"

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

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]
 

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