tests: require a group_vars folder in the scenario dir

This will allow for no changes needed in the ansible playbook command
when adding new scenarios. Each scenario will just need a hosts file and
a group_vars directory to define how the cluster should be setup.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/ubuntu/16.04/mon/initial_members/group_vars/all b/tests/functional/ubuntu/16.04/mon/initial_members/group_vars/all
new file mode 100644 (file)
index 0000000..f9c25f2
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/mon/initial_members/group_vars/all
@@ -0,0 +1,6 @@
+---
+
+ceph_stable: True
+public_network: "192.168.42.0/24"
+cluster_network: "192.168.43.0/24"
+journal_size: 100

diff --git a/tests/functional/ubuntu/16.04/mon/initial_members/hosts b/tests/functional/ubuntu/16.04/mon/initial_members/hosts
index b3fb9120459361bca5782c38f0ba12af1b0aa22a..4d938c3164ec703590d3977837fd57c1ac77f2e0 100644 (file)
--- a/tests/functional/ubuntu/16.04/mon/initial_members/hosts
+++ b/tests/functional/ubuntu/16.04/mon/initial_members/hosts
@@ -1,4 +1,2 @@
-
 [mons]
-mon0
-
+mon0 monitor_interface=eth1

diff --git a/tox.ini b/tox.ini
index 808d33dad8d3059df91ad2740146b1f0a1a998e3..94c08c6147b9a79abd8057bbd281d313c6de7953 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands=
   vagrant up --no-provision --provider=virtualbox
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
-  initial-members: ansible-playbook -i {toxinidir}/tests/functional/ubuntu/16.04/mon/initial_members/hosts --extra-vars "ceph_stable=True public_network=192.168.42.0/24 cluster_network=192.168.43.0/24 journal_size=100 monitor_interface=eth1" {toxinidir}/site.yml.sample
+  ansible-playbook -i {changedir}/hosts {toxinidir}/site.yml.sample
 
   py.test -v
   vagrant destroy --force