Updated from OpenStack Ansible Tests

Change-Id: I7d3ab30ca56f3c2aa1a4b2d5e472ab3320079bd3

Vagrantfile

@@ -31,6 +31,30 @@ Vagrant.configure(2) do |config|
          ./run_tests.sh
       SHELL
 
+  config.vm.define "centos7" do |centos7|
+    centos7.vm.box = "centos/7"
+  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
+
+  config.vm.define "gentoo" do |gentoo|
+    gentoo.vm.box = "generic/gentoo"
+  end
+
+  config.vm.define "opensuse150" do |leap150|
+    leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
+  end
+
+  config.vm.define "opensuse151" do |leap150|
+    leap150.vm.box = "opensuse/openSUSE-15.1-x86_64"
+  end
+
   config.vm.define "ubuntu1604" do |xenial|
     xenial.disksize.size = "40GB"
     xenial.vm.box = "ubuntu/xenial64"
@@ -40,17 +64,4 @@ Vagrant.configure(2) do |config|
     bionic.disksize.size = "40GB"
     bionic.vm.box = "ubuntu/bionic64"
   end
-
-  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 "centos7" do |centos7|
-    centos7.vm.box = "centos/7"
-  end
-
 end

run_tests.sh

@@ -65,7 +65,10 @@ case ${ID,,} in
 esac
 
 # Install git so that we can clone the tests repo if git is not available
-which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git
+case ${ID,,} in
+  gentoo) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" dev-vcs/git ;;
+  *) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git ;;
+esac
 
 # Clone the tests repo for access to the common test script
 if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
@@ -92,4 +95,3 @@ fi
 
 # Execute the common test script
 source tests/common/run_tests_common.sh
-