ceph-volume: update functional testing

various changes for fixing ceph-volume functional testing. cleaning up deploy.yml (drop py2 references) Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com> (cherry picked from commit 90bfaaa) (cherry picked from commit bf448e3)
ceph · Apr 12, 2024 · 63fe392 · 63fe392
1 parent f8948b5
commit 63fe392
Show file tree

Hide file tree

Showing 88 changed files with 69 additions and 574 deletions.
diff --git a/...e/mixed-type-dmcrypt-explicit/Vagrantfile → ...e/mixed-type-dmcrypt-explicit/Vagrantfile b/...e/mixed-type-dmcrypt-explicit/Vagrantfile → ...e/mixed-type-dmcrypt-explicit/Vagrantfile
diff --git a/...ixed-type-dmcrypt-explicit/group_vars/all → ...ixed-type-dmcrypt-explicit/group_vars/all b/...ixed-type-dmcrypt-explicit/group_vars/all → ...ixed-type-dmcrypt-explicit/group_vars/all
diff --git a/...uestore/mixed-type-dmcrypt-explicit/hosts → ...uestore/mixed-type-dmcrypt-explicit/hosts b/...uestore/mixed-type-dmcrypt-explicit/hosts → ...uestore/mixed-type-dmcrypt-explicit/hosts
diff --git a/...ore/mixed-type-dmcrypt-explicit/setup.yml → ...ore/mixed-type-dmcrypt-explicit/setup.yml b/...ore/mixed-type-dmcrypt-explicit/setup.yml → ...ore/mixed-type-dmcrypt-explicit/setup.yml
diff --git a/...tore/mixed-type-dmcrypt-explicit/test.yml → ...tore/mixed-type-dmcrypt-explicit/test.yml b/...tore/mixed-type-dmcrypt-explicit/test.yml → ...tore/mixed-type-dmcrypt-explicit/test.yml
diff --git a/.../mixed-type-dmcrypt-explicit/test_zap.yml → .../mixed-type-dmcrypt-explicit/test_zap.yml b/.../mixed-type-dmcrypt-explicit/test_zap.yml → .../mixed-type-dmcrypt-explicit/test_zap.yml
diff --git a/...pe-dmcrypt-explicit/vagrant_variables.yml → ...pe-dmcrypt-explicit/vagrant_variables.yml b/...pe-dmcrypt-explicit/vagrant_variables.yml → ...pe-dmcrypt-explicit/vagrant_variables.yml
diff --git a/.../bluestore/mixed-type-dmcrypt/Vagrantfile → .../bluestore/mixed-type-dmcrypt/Vagrantfile b/.../bluestore/mixed-type-dmcrypt/Vagrantfile → .../bluestore/mixed-type-dmcrypt/Vagrantfile
diff --git a/...uestore/mixed-type-dmcrypt/group_vars/all → ...uestore/mixed-type-dmcrypt/group_vars/all b/...uestore/mixed-type-dmcrypt/group_vars/all → ...uestore/mixed-type-dmcrypt/group_vars/all
diff --git a/...entos8/bluestore/mixed-type-dmcrypt/hosts → ...centos/bluestore/mixed-type-dmcrypt/hosts b/...entos8/bluestore/mixed-type-dmcrypt/hosts → ...centos/bluestore/mixed-type-dmcrypt/hosts
diff --git a/...s8/bluestore/mixed-type-dmcrypt/setup.yml → ...os/bluestore/mixed-type-dmcrypt/setup.yml b/...s8/bluestore/mixed-type-dmcrypt/setup.yml → ...os/bluestore/mixed-type-dmcrypt/setup.yml
diff --git a/...os8/bluestore/mixed-type-dmcrypt/test.yml → ...tos/bluestore/mixed-type-dmcrypt/test.yml b/...os8/bluestore/mixed-type-dmcrypt/test.yml → ...tos/bluestore/mixed-type-dmcrypt/test.yml
diff --git a/...bluestore/mixed-type-dmcrypt/test_zap.yml → ...bluestore/mixed-type-dmcrypt/test_zap.yml b/...bluestore/mixed-type-dmcrypt/test_zap.yml → ...bluestore/mixed-type-dmcrypt/test_zap.yml
diff --git a/.../mixed-type-dmcrypt/vagrant_variables.yml → .../mixed-type-dmcrypt/vagrant_variables.yml b/.../mixed-type-dmcrypt/vagrant_variables.yml → .../mixed-type-dmcrypt/vagrant_variables.yml
diff --git a/...bluestore/mixed-type-explicit/Vagrantfile → ...bluestore/mixed-type-explicit/Vagrantfile b/...bluestore/mixed-type-explicit/Vagrantfile → ...bluestore/mixed-type-explicit/Vagrantfile
diff --git a/...estore/mixed-type-explicit/group_vars/all → ...estore/mixed-type-explicit/group_vars/all b/...estore/mixed-type-explicit/group_vars/all → ...estore/mixed-type-explicit/group_vars/all
diff --git a/...ntos8/bluestore/mixed-type-explicit/hosts → ...entos/bluestore/mixed-type-explicit/hosts b/...ntos8/bluestore/mixed-type-explicit/hosts → ...entos/bluestore/mixed-type-explicit/hosts
diff --git a/...8/bluestore/mixed-type-explicit/setup.yml → ...s/bluestore/mixed-type-explicit/setup.yml b/...8/bluestore/mixed-type-explicit/setup.yml → ...s/bluestore/mixed-type-explicit/setup.yml
diff --git a/...s8/bluestore/mixed-type-explicit/test.yml → ...os/bluestore/mixed-type-explicit/test.yml b/...s8/bluestore/mixed-type-explicit/test.yml → ...os/bluestore/mixed-type-explicit/test.yml
diff --git a/...luestore/mixed-type-explicit/test_zap.yml → ...luestore/mixed-type-explicit/test_zap.yml b/...luestore/mixed-type-explicit/test_zap.yml → ...luestore/mixed-type-explicit/test_zap.yml
diff --git a/...mixed-type-explicit/vagrant_variables.yml → ...mixed-type-explicit/vagrant_variables.yml b/...mixed-type-explicit/vagrant_variables.yml → ...mixed-type-explicit/vagrant_variables.yml
diff --git a/.../centos8/bluestore/mixed-type/Vagrantfile → ...h/centos/bluestore/mixed-type/Vagrantfile b/.../centos8/bluestore/mixed-type/Vagrantfile → ...h/centos/bluestore/mixed-type/Vagrantfile
diff --git a/...ntos8/bluestore/mixed-type/group_vars/all → ...entos/bluestore/mixed-type/group_vars/all b/...ntos8/bluestore/mixed-type/group_vars/all → ...entos/bluestore/mixed-type/group_vars/all
diff --git a/.../batch/centos8/bluestore/mixed-type/hosts → ...l/batch/centos/bluestore/mixed-type/hosts b/.../batch/centos8/bluestore/mixed-type/hosts → ...l/batch/centos/bluestore/mixed-type/hosts
diff --git a/...ch/centos8/bluestore/mixed-type/setup.yml → ...tch/centos/bluestore/mixed-type/setup.yml b/...ch/centos8/bluestore/mixed-type/setup.yml → ...tch/centos/bluestore/mixed-type/setup.yml
diff --git a/...tch/centos8/bluestore/mixed-type/test.yml → ...atch/centos/bluestore/mixed-type/test.yml b/...tch/centos8/bluestore/mixed-type/test.yml → ...atch/centos/bluestore/mixed-type/test.yml
diff --git a/...centos8/bluestore/mixed-type/test_zap.yml → .../centos/bluestore/mixed-type/test_zap.yml b/...centos8/bluestore/mixed-type/test_zap.yml → .../centos/bluestore/mixed-type/test_zap.yml
diff --git a/...luestore/mixed-type/vagrant_variables.yml → ...luestore/mixed-type/vagrant_variables.yml b/...luestore/mixed-type/vagrant_variables.yml → ...luestore/mixed-type/vagrant_variables.yml
diff --git a/...bluestore/single-type-dmcrypt/Vagrantfile → ...bluestore/single-type-dmcrypt/Vagrantfile b/...bluestore/single-type-dmcrypt/Vagrantfile → ...bluestore/single-type-dmcrypt/Vagrantfile
diff --git a/...estore/single-type-dmcrypt/group_vars/all → ...estore/single-type-dmcrypt/group_vars/all b/...estore/single-type-dmcrypt/group_vars/all → ...estore/single-type-dmcrypt/group_vars/all
diff --git a/...ntos8/bluestore/single-type-dmcrypt/hosts → ...entos/bluestore/single-type-dmcrypt/hosts b/...ntos8/bluestore/single-type-dmcrypt/hosts → ...entos/bluestore/single-type-dmcrypt/hosts
diff --git a/...8/bluestore/single-type-dmcrypt/setup.yml → ...s/bluestore/single-type-dmcrypt/setup.yml b/...8/bluestore/single-type-dmcrypt/setup.yml → ...s/bluestore/single-type-dmcrypt/setup.yml
diff --git a/...s8/bluestore/single-type-dmcrypt/test.yml → ...os/bluestore/single-type-dmcrypt/test.yml b/...s8/bluestore/single-type-dmcrypt/test.yml → ...os/bluestore/single-type-dmcrypt/test.yml
diff --git a/...luestore/single-type-dmcrypt/test_zap.yml → ...luestore/single-type-dmcrypt/test_zap.yml b/...luestore/single-type-dmcrypt/test_zap.yml → ...luestore/single-type-dmcrypt/test_zap.yml
diff --git a/...single-type-dmcrypt/vagrant_variables.yml → ...single-type-dmcrypt/vagrant_variables.yml b/...single-type-dmcrypt/vagrant_variables.yml → ...single-type-dmcrypt/vagrant_variables.yml
diff --git a/...centos8/bluestore/single-type/Vagrantfile → .../centos/bluestore/single-type/Vagrantfile b/...centos8/bluestore/single-type/Vagrantfile → .../centos/bluestore/single-type/Vagrantfile
diff --git a/...tos8/bluestore/single-type/group_vars/all → ...ntos/bluestore/single-type/group_vars/all b/...tos8/bluestore/single-type/group_vars/all → ...ntos/bluestore/single-type/group_vars/all
diff --git a/...batch/centos8/bluestore/single-type/hosts → .../batch/centos/bluestore/single-type/hosts b/...batch/centos8/bluestore/single-type/hosts → .../batch/centos/bluestore/single-type/hosts
diff --git a/...h/centos8/bluestore/single-type/setup.yml → ...ch/centos/bluestore/single-type/setup.yml b/...h/centos8/bluestore/single-type/setup.yml → ...ch/centos/bluestore/single-type/setup.yml
diff --git a/...ch/centos8/bluestore/single-type/test.yml → ...tch/centos/bluestore/single-type/test.yml b/...ch/centos8/bluestore/single-type/test.yml → ...tch/centos/bluestore/single-type/test.yml
diff --git a/...entos8/bluestore/single-type/test_zap.yml → ...centos/bluestore/single-type/test_zap.yml b/...entos8/bluestore/single-type/test_zap.yml → ...centos/bluestore/single-type/test_zap.yml
diff --git a/...uestore/single-type/vagrant_variables.yml → ...uestore/single-type/vagrant_variables.yml b/...uestore/single-type/vagrant_variables.yml → ...uestore/single-type/vagrant_variables.yml
diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
@@ -14,29 +14,29 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 - hosts: osds
   become: yes
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap {{ item }} --destroy"
+      command: "ceph-volume lvm zap {{ item }} --destroy"
       with_items: "{{ devices }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: batch create devices again
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: ensure batch create is idempotent
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       register: batch_cmd
       failed_when: false
       environment:
@@ -50,7 +50,7 @@
          - "'strategy changed' not in batch_cmd.stderr"
 
     - name: run batch --report to see if devices get filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       register: report_cmd
       failed_when: false
       environment:

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
@@ -14,10 +14,10 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 - hosts: osds
@@ -27,18 +27,18 @@
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap {{ item }} --destroy"
+      command: "ceph-volume lvm zap {{ item }} --destroy"
       with_items: "{{ devices }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: batch create devices again
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: ensure batch create is idempotent when all data devices are filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       register: batch_cmd
       failed_when: false
       environment:
@@ -51,7 +51,7 @@
          - batch_cmd.rc != 0
 
     - name: run batch --report to see if devices get filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       register: report_cmd
       failed_when: false
       environment:

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml
@@ -15,10 +15,10 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 
@@ -27,7 +27,7 @@
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      command: "ceph-volume lvm zap --osd-id {{ item }} --destroy"
       with_items: "{{ osd_ids }}"
       environment:
         CEPH_VOLUME_DEBUG: 1

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = centos8-bluestore-{single_type,single_type_dmcrypt,mixed_type,mixed_type_dmcrypt,mixed_type_explicit,mixed_type_dmcrypt_explicit}
+envlist = centos-bluestore-{single_type,single_type_dmcrypt,mixed_type,mixed_type_dmcrypt,mixed_type_explicit,mixed_type_dmcrypt_explicit}
 skipsdist = True
 
 [testenv]
@@ -18,17 +18,19 @@ setenv=
   VAGRANT_CWD = {changedir}
   CEPH_VOLUME_DEBUG = 1
   DEBIAN_FRONTEND=noninteractive
+  ANSIBLE_COLLECTIONS_PATH = {envdir}/ansible_collections
+  CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 changedir=
-  centos8-bluestore-single_type: {toxinidir}/centos8/bluestore/single-type
-  centos8-bluestore-single_type_dmcrypt: {toxinidir}/centos8/bluestore/single-type-dmcrypt
-  centos8-bluestore-mixed_type: {toxinidir}/centos8/bluestore/mixed-type
-  centos8-bluestore-mixed_type_dmcrypt: {toxinidir}/centos8/bluestore/mixed-type-dmcrypt
-  centos8-bluestore-mixed_type_explicit: {toxinidir}/centos8/bluestore/mixed-type-explicit
-  centos8-bluestore-mixed_type_dmcrypt_explicit: {toxinidir}/centos8/bluestore/mixed-type-dmcrypt-explicit
+  centos-bluestore-single_type: {toxinidir}/centos/bluestore/single-type
+  centos-bluestore-single_type_dmcrypt: {toxinidir}/centos/bluestore/single-type-dmcrypt
+  centos-bluestore-mixed_type: {toxinidir}/centos/bluestore/mixed-type
+  centos-bluestore-mixed_type_dmcrypt: {toxinidir}/centos/bluestore/mixed-type-dmcrypt
+  centos-bluestore-mixed_type_explicit: {toxinidir}/centos/bluestore/mixed-type-explicit
+  centos-bluestore-mixed_type_dmcrypt_explicit: {toxinidir}/centos/bluestore/mixed-type-dmcrypt-explicit
 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
   python -m 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:""} {posargs:--provider=virtualbox}
   bash {toxinidir}/../scripts/vagrant_up.sh {posargs:--provider=virtualbox}
@@ -44,9 +46,6 @@ commands=
   # 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
-
   # 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
 

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore
@@ -1,10 +1,8 @@
 ---
 
 ceph_dev: True
-cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
-monitor_interface: eth1
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 num_osds: 2

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm
@@ -1,10 +1,8 @@
 ---
 
 ceph_dev: True
-cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
-monitor_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt
@@ -2,10 +2,8 @@
 
 dmcrypt: True
 ceph_dev: True
-cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
-monitor_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_single b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_single
@@ -1,10 +1,8 @@
 ---
 
 ceph_dev: True
-cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
-monitor_interface: eth1
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 ceph_origin: 'repository'

diff --git a/.../lvm/centos8/bluestore/create/Vagrantfile → ...l/lvm/centos/bluestore/create/Vagrantfile b/.../lvm/centos8/bluestore/create/Vagrantfile → ...l/lvm/centos/bluestore/create/Vagrantfile
diff --git a/...m/centos8/bluestore/create/group_vars/all → ...vm/centos/bluestore/create/group_vars/all b/...m/centos8/bluestore/create/group_vars/all → ...vm/centos/bluestore/create/group_vars/all
diff --git a/...tional/lvm/centos8/bluestore/create/hosts → ...ctional/lvm/centos/bluestore/create/hosts b/...tional/lvm/centos8/bluestore/create/hosts → ...ctional/lvm/centos/bluestore/create/hosts
diff --git a/...al/lvm/centos8/bluestore/create/setup.yml → ...nal/lvm/centos/bluestore/create/setup.yml b/...al/lvm/centos8/bluestore/create/setup.yml → ...nal/lvm/centos/bluestore/create/setup.yml
diff --git a/...nal/lvm/centos8/bluestore/create/test.yml → ...onal/lvm/centos/bluestore/create/test.yml b/...nal/lvm/centos8/bluestore/create/test.yml → ...onal/lvm/centos/bluestore/create/test.yml
diff --git a/...s8/bluestore/create/vagrant_variables.yml → ...os/bluestore/create/vagrant_variables.yml b/...s8/bluestore/create/vagrant_variables.yml → ...os/bluestore/create/vagrant_variables.yml
diff --git a/...lvm/centos8/bluestore/dmcrypt/Vagrantfile → .../lvm/centos/bluestore/dmcrypt/Vagrantfile b/...lvm/centos8/bluestore/dmcrypt/Vagrantfile → .../lvm/centos/bluestore/dmcrypt/Vagrantfile
diff --git a/.../centos8/bluestore/dmcrypt/group_vars/all → ...m/centos/bluestore/dmcrypt/group_vars/all b/.../centos8/bluestore/dmcrypt/group_vars/all → ...m/centos/bluestore/dmcrypt/group_vars/all
diff --git a/...ional/lvm/centos8/bluestore/dmcrypt/hosts → ...tional/lvm/centos/bluestore/dmcrypt/hosts b/...ional/lvm/centos8/bluestore/dmcrypt/hosts → ...tional/lvm/centos/bluestore/dmcrypt/hosts
diff --git a/...l/lvm/centos8/bluestore/dmcrypt/setup.yml → ...al/lvm/centos/bluestore/dmcrypt/setup.yml b/...l/lvm/centos8/bluestore/dmcrypt/setup.yml → ...al/lvm/centos/bluestore/dmcrypt/setup.yml
diff --git a/...al/lvm/centos8/bluestore/dmcrypt/test.yml → ...nal/lvm/centos/bluestore/dmcrypt/test.yml b/...al/lvm/centos8/bluestore/dmcrypt/test.yml → ...nal/lvm/centos/bluestore/dmcrypt/test.yml
@@ -16,20 +16,20 @@
   become: yes
   tasks:
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items:
         - 0
         - 2
 
     - name: destroy osd.2
-      command: "ceph --cluster {{ cluster }} osd destroy osd.2 --yes-i-really-mean-it"
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
       register: result
       retries: 30
       delay: 1
       until: result is succeeded
 
     - name: destroy osd.0
-      command: "ceph --cluster {{ cluster }} osd destroy osd.0 --yes-i-really-mean-it"
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
       register: result
       retries: 30
       delay: 1
@@ -41,7 +41,7 @@
 
     # osd.2 device
     - name: zap /dev/vdd1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy"
+      command: "ceph-volume lvm zap /dev/vdd1 --destroy"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
@@ -57,18 +57,18 @@
         state: present
 
     - name: redeploy osd.2 using /dev/vdd1
-      command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/vdd1 --osd-id 2"
+      command: "ceph-volume lvm create --bluestore --data /dev/vdd1 --osd-id 2"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     # osd.0 lv
     - name: zap test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap test_group/data-lv1"
+      command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: redeploy osd.0 using test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data test_group/data-lv1 --osd-id 0"
+      command: "ceph-volume lvm create --bluestore --data test_group/data-lv1 --osd-id 0"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
@@ -82,10 +82,10 @@
   become: yes
   tasks:
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.0"
+      command: "ceph osd down osd.0"
 
     - name: destroy osd.0
-      command: "ceph --cluster {{ cluster }} osd destroy osd.0 --yes-i-really-mean-it"
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
       register: result
       retries: 30
       delay: 1
@@ -98,12 +98,12 @@
 
 
     - name: zap test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap test_group/data-lv1"
+      command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: prepare osd.0 using test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm prepare --bluestore --data test_group/data-lv1 --osd-id 0"
+      command: "ceph-volume lvm prepare --bluestore --data test_group/data-lv1 --osd-id 0"
       environment:
         CEPH_VOLUME_DEBUG: 1
 

diff --git a/...8/bluestore/dmcrypt/vagrant_variables.yml → ...s/bluestore/dmcrypt/vagrant_variables.yml b/...8/bluestore/dmcrypt/vagrant_variables.yml → ...s/bluestore/dmcrypt/vagrant_variables.yml
diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml
@@ -18,20 +18,20 @@
   become: yes
   tasks:
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items:
         - 0
         - 2
 
     - name: destroy osd.2
-      command: "ceph --cluster {{ cluster }} osd destroy osd.2 --yes-i-really-mean-it"
+      command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
       register: result
       retries: 30
       delay: 1
       until: result is succeeded
 
     - name: destroy osd.0
-      command: "ceph --cluster {{ cluster }} osd destroy osd.0 --yes-i-really-mean-it"
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
       register: result
       retries: 30
       delay: 1
@@ -44,7 +44,7 @@
 
     # osd.2 device
     - name: zap /dev/vdd1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap /dev/vdd1 --destroy"
+      command: "ceph-volume lvm zap /dev/vdd1 --destroy"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
@@ -60,18 +60,18 @@
         state: present
 
     - name: redeploy osd.2 using /dev/vdd1
-      command: "ceph-volume --cluster {{ cluster }} lvm create --bluestore --data /dev/vdd1 --osd-id 2"
+      command: "ceph-volume lvm create --bluestore --data /dev/vdd1 --osd-id 2"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     # osd.0 device (zap without --destroy that removes the LV)
     - name: zap test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap test_group/data-lv1"
+      command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: prepare osd.0 again using test_group/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm prepare --bluestore --data test_group/data-lv1 --osd-id 0"
+      command: "ceph-volume lvm prepare --bluestore --data test_group/data-lv1 --osd-id 0"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
@@ -151,11 +151,11 @@
 
     # zapping the first lv shouldn't remove the vg, allowing the second zap to succeed
     - name: zap test_zap/data-lv1
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --destroy test_zap/data-lv1"
+      command: "ceph-volume lvm zap --destroy test_zap/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: zap test_zap/data-lv2
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --destroy test_zap/data-lv2"
+      command: "ceph-volume lvm zap --destroy test_zap/data-lv2"
       environment:
         CEPH_VOLUME_DEBUG: 1
diff --git 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