From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 4 Nov 2016 18:01:28 +0000 (-0400)
Subject: tests: make the tox.ini config call the ssh config helper script
X-Git-Tag: v2.0~11^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8427e5a4a3d8a96722bacd38cde50a3fe8a27604;p=ceph-ansible.git

tests: make the tox.ini config call the ssh config helper script

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: pytest#harness
---

diff --git a/tox.ini b/tox.ini
index 36c8adf6f..808d33dad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
-envlist = {ansible2.1,ansible2.2}-{initial-members} 
+envlist = {ansible2.1,ansible2.2}-{initial-members}
 skipsdist = True
 
 [testenv]
-whitelist_externals = vagrant
+whitelist_externals =
+    vagrant
+    bash
 passenv=*
 setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
@@ -13,10 +15,12 @@ deps=
   ansible2.2: ansible==2.2
   -r{toxinidir}/tests/requirements.txt
 changedir=
-  initial-members: {toxinidir}/tests/functional/ubuntu/16.04/mon/initial_members 
+  initial-members: {toxinidir}/tests/functional/ubuntu/16.04/mon/initial_members
 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
 
   py.test -v
+  vagrant destroy --force