update sources to 12.2.7

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / functional / simple / tox.ini

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini b/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
index 6d48c35b3b633e6908a0a7263346e1f40921ec21..d5e9c33ea6401f0f52d7cf5bfc3f0a1e854ae0f3 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
+++ b/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
@@ -11,14 +11,17 @@ whitelist_externals =
 passenv=*
 setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
+  ANSIBLE_ACTION_PLUGINS = {envdir}/tmp/ceph-ansible/plugins/actions
   ANSIBLE_STDOUT_CALLBACK = debug
   ANSIBLE_RETRY_FILES_ENABLED = False
+  ANSIBLE_SSH_RETRIES = 5
   VAGRANT_CWD = {changedir}
   CEPH_VOLUME_DEBUG = 1
 deps=
   ansible==2.4.1
   testinfra==1.7.1
   pytest-xdist
+  notario>=0.0.13
 changedir=
   centos7-filestore-activate: {toxinidir}/centos7/filestore/activate
   centos7-bluestore-activate: {toxinidir}/centos7/bluestore/activate
@@ -34,6 +37,9 @@ changedir=
   centos7-filestore-dmcrypt_luks: {toxinidir}/centos7/filestore/dmcrypt-luks
 commands=
   git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
+  # XXX Ideally we should be able to consume the requirements for ceph-ansible directly,
+  # but the master branch doesn't pin dependencies so we can't guarantee to work correctly
+  #pip install -r {envdir}/tmp/ceph-ansible/requirements.txt
 
   vagrant up --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}
@@ -51,7 +57,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts {changedir}/test.yml
 
   # reboot all vms
-  vagrant reload --no-provision
+  bash {toxinidir}/../scripts/vagrant_reload.sh {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
 
   # wait 2 minutes for services to be ready
   sleep 120