From 8a74928a194b8ed6ac5cfff4ab1724f9226fee2c Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 3 Apr 2019 16:22:47 -0400 Subject: [PATCH] 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 (cherry picked from commit 52b9f3fb2886d703b25f650221ea973147c68ed6) --- tests/functional/bs-lvm-osds/Vagrantfile | 1 - tests/functional/bs-lvm-osds/ceph-override.json | 1 - tests/functional/bs-lvm-osds/container/Vagrantfile | 1 - tests/functional/bs-lvm-osds/container/ceph-override.json | 1 - tests/functional/lvm-osds/container/group_vars/all | 3 +-- tests/functional/lvm-osds/container/hosts | 5 ++++- tests/functional/lvm-osds/container/vagrant_variables.yml | 2 +- tests/functional/lvm-osds/group_vars/all | 1 - tests/functional/lvm-osds/hosts | 5 ++++- tests/functional/lvm-osds/vagrant_variables.yml | 2 +- tox.ini | 3 +-- 11 files changed, 12 insertions(+), 13 deletions(-) delete mode 120000 tests/functional/bs-lvm-osds/Vagrantfile delete mode 120000 tests/functional/bs-lvm-osds/ceph-override.json delete mode 120000 tests/functional/bs-lvm-osds/container/Vagrantfile delete mode 120000 tests/functional/bs-lvm-osds/container/ceph-override.json diff --git a/tests/functional/bs-lvm-osds/Vagrantfile b/tests/functional/bs-lvm-osds/Vagrantfile deleted file mode 120000 index 706a5bb47..000000000 --- a/tests/functional/bs-lvm-osds/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/ceph-override.json b/tests/functional/bs-lvm-osds/ceph-override.json deleted file mode 120000 index fe2ff40d6..000000000 --- a/tests/functional/bs-lvm-osds/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/container/Vagrantfile b/tests/functional/bs-lvm-osds/container/Vagrantfile deleted file mode 120000 index 16076e424..000000000 --- a/tests/functional/bs-lvm-osds/container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/container/ceph-override.json b/tests/functional/bs-lvm-osds/container/ceph-override.json deleted file mode 120000 index 8417cc0c9..000000000 --- a/tests/functional/bs-lvm-osds/container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 45e2df893..c6119f8ec 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -11,7 +11,6 @@ cluster_network: "192.168.40.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 -osd_objectstore: "filestore" copy_admin_key: true containerized_deployment: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb @@ -29,4 +28,4 @@ os_tuning_params: ceph_conf_overrides: global: osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file +ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/lvm-osds/container/hosts b/tests/functional/lvm-osds/container/hosts index d6c89012a..32da771c9 100644 --- a/tests/functional/lvm-osds/container/hosts +++ b/tests/functional/lvm-osds/container/hosts @@ -5,4 +5,7 @@ mon0 mon0 [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 diff --git a/tests/functional/lvm-osds/container/vagrant_variables.yml b/tests/functional/lvm-osds/container/vagrant_variables.yml index bd8309495..22ca25261 100644 --- a/tests/functional/lvm-osds/container/vagrant_variables.yml +++ b/tests/functional/lvm-osds/container/vagrant_variables.yml @@ -5,7 +5,7 @@ docker: true # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 1 -osd_vms: 1 +osd_vms: 4 mds_vms: 0 rgw_vms: 0 nfs_vms: 0 diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all index 2857469b9..4ef95dc27 100644 --- a/tests/functional/lvm-osds/group_vars/all +++ b/tests/functional/lvm-osds/group_vars/all @@ -7,7 +7,6 @@ cluster_network: "192.168.40.0/24" monitor_interface: eth1 radosgw_interface: eth1 journal_size: 100 -osd_objectstore: "filestore" copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb osd_scenario: lvm diff --git a/tests/functional/lvm-osds/hosts b/tests/functional/lvm-osds/hosts index d6c89012a..32da771c9 100644 --- a/tests/functional/lvm-osds/hosts +++ b/tests/functional/lvm-osds/hosts @@ -5,4 +5,7 @@ mon0 mon0 [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 diff --git a/tests/functional/lvm-osds/vagrant_variables.yml b/tests/functional/lvm-osds/vagrant_variables.yml index 342ce5f9c..d2a5ee12e 100644 --- a/tests/functional/lvm-osds/vagrant_variables.yml +++ b/tests/functional/lvm-osds/vagrant_variables.yml @@ -5,7 +5,7 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 1 -osd_vms: 1 +osd_vms: 4 mds_vms: 0 rgw_vms: 0 nfs_vms: 0 diff --git a/tox.ini b/tox.ini index f40141f23..1befd6f01 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [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}-container-{cluster,ooo_collocation,infra_lv_create} infra_lv_create @@ -219,7 +219,6 @@ changedir= switch_to_containers: {toxinidir}/tests/functional/all_daemons lvm_osds: {toxinidir}/tests/functional/lvm-osds{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 add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:}