ceph-volume: tox define vagrant cwd

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

diff --git a/src/ceph-volume/ceph_volume/tests/functional/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/tox.ini
index ba7ca5eba2346a9f09c24fdc63dd8dca6fe78099..f46337e9ecc58b6cd26aca385609a9e888c13628 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/tox.ini
@@ -12,6 +12,7 @@ setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
   ANSIBLE_STDOUT_CALLBACK = debug
   ANSIBLE_RETRY_FILES_ENABLED = False
+  VAGRANT_CWD = {changedir}
 deps=
   ansible==2.2.3
   testinfra==1.6.0
@@ -26,6 +27,7 @@ commands=
   bash {toxinidir}/scripts/generate_ssh_config.sh {changedir}
 
   # create logical volumes to test with on the vms
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/setup.yml
   ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml
 
   # use ceph-ansible to deploy a ceph cluster on the vms
@@ -36,7 +38,7 @@ commands=
 
   # reboot all vms
   vagrant reload --no-provision
-  
+
   # retest to ensure cluster came back up correctly after rebooting
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests