From fa24f09ff4a2bba64a7d3cea94bf407b17043afb Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@ansible.com>
Date: Fri, 11 Nov 2016 12:59:58 -0500
Subject: [PATCH] Improve and cleanup tests

---
 tests/Vagrantfile | 16 +++++++++++++---
 tests/test.yml    |  1 -
 tests/vagrant.yml | 10 ++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/Vagrantfile b/tests/Vagrantfile
index 4761c77..88263a0 100644
--- a/tests/Vagrantfile
+++ b/tests/Vagrantfile
@@ -1,15 +1,25 @@
 Vagrant.configure(2) do |config|
 
   # RHEL 6
-  config.vm.define "rhel6" do |rhel6|
+  config.vm.define "rhsub-rhel6" do |rhel6|
     rhel6.vm.box = "samdoran/rhel6"
-    rhel6.vm.hostname = "java-rhel6"
+    rhel6.vm.hostname = "rhsub-rhel6"
+    config.vm.provider "virtualbox" do |vbox|
+      vbox.name = "rhsub-rhel7"
+      vbox.cpus = 1
+      vbox.memory = 128
+    end
   end
 
   # RHEL 7
   config.vm.define "rhel7" do |rhel7|
     rhel7.vm.box = "samdoran/rhel7"
-    rhel7.vm.hostname = "java-rhel7"
+    rhel7.vm.hostname = "rhsub-rhel7"
+    config.vm.provider "virtualbox" do |vbox|
+      vbox.name = "rhsub-rhel7"
+      vbox.cpus = 1
+      vbox.memory = 128
+    end
   end
 
   config.vm.provision "ansible" do |ansible|
diff --git a/tests/test.yml b/tests/test.yml
index ecdd8a9..caa8e4f 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,4 +1,3 @@
----
 - hosts: localhost
   remote_user: root
   roles:
diff --git a/tests/vagrant.yml b/tests/vagrant.yml
index 97a3892..c974591 100644
--- a/tests/vagrant.yml
+++ b/tests/vagrant.yml
@@ -1,6 +1,12 @@
----
 - hosts: all
   remote_user: vagrant
-  become: True
+  become: yes
+
+  vars:
+    rhsub_state: present
+    rhsub_repos:
+      - name: rhel-7-server-extras-rpms     # wildcard or repo name
+        state: enable
+
   roles:
     - redhat-subscription