1 files changed, 9 insertions, 10 deletions
diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
index 49c969059..8b49b7ac2 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = centos8-bluestore-{create,prepare_activate,dmcrypt}
+envlist = centos-bluestore-{create,prepare_activate,dmcrypt}
 skipsdist = True
 
 [testenv]
@@ -18,18 +18,20 @@ setenv=
   VAGRANT_CWD = {changedir}
   CEPH_VOLUME_DEBUG = 1
   DEBIAN_FRONTEND=noninteractive
+  ANSIBLE_COLLECTIONS_PATH = {envdir}/ansible_collections
+  CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 changedir=
   # plain/unencrypted
-  centos8-bluestore-create: {toxinidir}/centos8/bluestore/create
+  centos-bluestore-create: {toxinidir}/centos/bluestore/create
   # dmcrypt
-  centos8-bluestore-dmcrypt: {toxinidir}/centos8/bluestore/dmcrypt
+  centos-bluestore-dmcrypt: {toxinidir}/centos/bluestore/dmcrypt
   # TODO: these are placeholders for now, eventually we want to
   # test the prepare/activate workflow of ceph-volume as well
-  centos8-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
+  centos-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
 commands=
-  git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch {env:CEPH_ANSIBLE_CLONE:"https://github.com/ceph/ceph-ansible.git"} {envdir}/tmp/ceph-ansible
+  git clone -b {env:CEPH_ANSIBLE_BRANCH:main} --single-branch {env:CEPH_ANSIBLE_CLONE:"https://github.com/ceph/ceph-ansible.git"} {envdir}/tmp/ceph-ansible
   pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt
-  ansible-galaxy install -r {envdir}/tmp/ceph-ansible/requirements.yml -v
+  ansible-galaxy collection install -r {envdir}/tmp/ceph-ansible/requirements.yml -v -p {envdir}/ansible_collections
 
   bash {toxinidir}/../scripts/vagrant_up.sh {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
   bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}
@@ -45,10 +47,7 @@ commands=
   cp {toxinidir}/../playbooks/deploy.yml {envdir}/tmp/ceph-ansible
 
   # use ceph-ansible to deploy a ceph cluster on the vms
-  ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/deploy.yml --extra-vars "fetch_directory={changedir}/fetch ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} toxinidir={toxinidir}"
-
-  # prepare nodes for testing with testinfra
-  ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml
+  ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/deploy.yml --extra-vars "fetch_directory={changedir}/fetch ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} toxinidir={toxinidir}"
 
   # test cluster state using testinfra
   py.test --reruns 5 --reruns-delay 10 -n 4 --sudo -v --connection=ansible --ssh-config={changedir}/vagrant_ssh_config --ansible-inventory={changedir}/hosts {toxinidir}/../tests