From 7c9063b1d2b1af22feb65e70cd8c4dd2de179fb9 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 1 Feb 2021 20:32:37 +0100 Subject: [PATCH] tests: use lvm batch on osd2 (all_daemons) in order to test lvm batch in purge scenario. Signed-off-by: Guillaume Abrioux --- tests/functional/all_daemons/container/hosts | 2 +- tests/functional/all_daemons/hosts | 2 +- tox.ini | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts index d5b2dda56..cee1376dd 100644 --- a/tests/functional/all_daemons/container/hosts +++ b/tests/functional/all_daemons/container/hosts @@ -9,7 +9,7 @@ mgr0 [osds] osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" -osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" +osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc']" lvm_volumes="[]" [mdss] mds0 diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts index 595c2bfa1..ace86a0e9 100644 --- a/tests/functional/all_daemons/hosts +++ b/tests/functional/all_daemons/hosts @@ -9,7 +9,7 @@ mgr0 [osds] osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" -osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" +osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc']" lvm_volumes="[]" [mdss] mds0 diff --git a/tox.ini b/tox.ini index bc90ae528..55a848341 100644 --- a/tox.ini +++ b/tox.ini @@ -56,8 +56,8 @@ commands= ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ " - # re-setup lvm - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml + # re-setup lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2' # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ @@ -337,8 +337,8 @@ commands= bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} - # configure lvm - !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml + # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) + !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2' rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" -- 2.39.5