ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tox: Refact lvm_osds scenario 

The current lvm_osds only tests filestore on one OSD node.
We also have bs_lvm_osds to test bluestore and encryption.
Let's use only one scenario to test filestore/bluestore and with or
without dmcrypt on four OSD nodes.
Also use validate_dmcrypt_bool_value instead of types.boolean on
dmcrypt validation via notario.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 52b9f3fb28)
pull/4039/head v3.2.16
Dimitri Savineau 2019-04-03 16:22:47 -04:00 committed by Guillaume Abrioux
parent 0a24078bbb
commit 8a74928a19
11 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/functional/bs-lvm-osds/Vagrantfile vendored
View File

@ -1 +0,0 @@
../../../Vagrantfile

1
tests/functional/bs-lvm-osds/ceph-override.json
View File

@ -1 +0,0 @@
../all_daemons/ceph-override.json

1
tests/functional/bs-lvm-osds/container/Vagrantfile vendored
View File

@ -1 +0,0 @@
../../../../Vagrantfile

1
tests/functional/bs-lvm-osds/container/ceph-override.json
View File

@ -1 +0,0 @@
../../all_daemons/ceph-override.json

3
tests/functional/lvm-osds/container/group_vars/all
View File

@ -11,7 +11,6 @@ cluster_network: "192.168.40.0/24"
monitor_interface: eth1 monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "filestore"
copy_admin_key: true copy_admin_key: true
containerized_deployment: true containerized_deployment: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
@ -29,4 +28,4 @@ os_tuning_params:
ceph_conf_overrides: ceph_conf_overrides:
global: global:
osd_pool_default_size: 1 osd_pool_default_size: 1
ceph_osd_docker_run_script_path: /var/tmp ceph_osd_docker_run_script_path: /var/tmp

5
tests/functional/lvm-osds/container/hosts
View File

@ -5,4 +5,7 @@ mon0
mon0 mon0
[osds] [osds]
osd0 osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]"
osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
osd2 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'db': 'journal1', 'db_vg': 'journals'}]"
osd3 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group'}]" dmcrypt=true

2
tests/functional/lvm-osds/container/vagrant_variables.yml
View File

@ -5,7 +5,7 @@ docker: true
# DEFINE THE NUMBER OF VMS TO RUN # DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1 mon_vms: 1
osd_vms: 1 osd_vms: 4
mds_vms: 0 mds_vms: 0
rgw_vms: 0 rgw_vms: 0
nfs_vms: 0 nfs_vms: 0

1
tests/functional/lvm-osds/group_vars/all
View File

@ -7,7 +7,6 @@ cluster_network: "192.168.40.0/24"
monitor_interface: eth1 monitor_interface: eth1
radosgw_interface: eth1 radosgw_interface: eth1
journal_size: 100 journal_size: 100
osd_objectstore: "filestore"
copy_admin_key: true copy_admin_key: true
# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
osd_scenario: lvm osd_scenario: lvm

5
tests/functional/lvm-osds/hosts
View File

@ -5,4 +5,7 @@ mon0
mon0 mon0
[osds] [osds]
osd0 osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]"
osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
osd2 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'db': 'journal1', 'db_vg': 'journals'}]"
osd3 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group'}]" dmcrypt=true

2
tests/functional/lvm-osds/vagrant_variables.yml
View File

@ -5,7 +5,7 @@ docker: false
# DEFINE THE NUMBER OF VMS TO RUN # DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1 mon_vms: 1
osd_vms: 1 osd_vms: 4
mds_vms: 0 mds_vms: 0
rgw_vms: 0 rgw_vms: 0
nfs_vms: 0 nfs_vms: 0

3
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = {luminous,mimic,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge} envlist = {luminous,mimic,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge}
{luminous,mimic,rhcs}-{centos,ubuntu}-non_container-switch_to_containers {luminous,mimic,rhcs}-{centos,ubuntu}-non_container-switch_to_containers
{luminous,mimic,rhcs}-{centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create} {luminous,mimic,rhcs}-{centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create}
infra_lv_create infra_lv_create
@ -219,7 +219,6 @@ changedir=
switch_to_containers: {toxinidir}/tests/functional/all_daemons switch_to_containers: {toxinidir}/tests/functional/all_daemons
lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:} lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:}
lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:} lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:}
bluestore_lvm_osds: {toxinidir}/tests/functional/bs-lvm-osds{env:CONTAINER_DIR:}
ooo_collocation: {toxinidir}/tests/functional/ooo-collocation ooo_collocation: {toxinidir}/tests/functional/ooo-collocation
add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:}
rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:} rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:}