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 52b9f3fb2886d703b25f650221ea973147c68ed6)

diff --git a/tests/functional/bs-lvm-osds/Vagrantfile b/tests/functional/bs-lvm-osds/Vagrantfile
deleted file mode 120000 (symlink)
index 706a5bb..0000000
--- 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 (symlink)
index fe2ff40..0000000
--- 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 (symlink)
index 16076e4..0000000
--- 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 (symlink)
index 8417cc0..0000000
--- 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 45e2df8930356e7ef00b5384d63fe68a19d84d21..c6119f8ecd0cabb68678e16e42c603dbbba7d93c 100644 (file)
--- 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 d6c89012a9db9c79663024d925b78041bbab1a99..32da771c9e46e75c147c9917ecd8cc724c90087f 100644 (file)
--- 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 bd8309495c7681e6439a01022037f89e77d42efa..22ca25261faf7007d2c049e17dfcd9768641fe4d 100644 (file)
--- 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 2857469b99b149135036b04d6cd8f622fe472351..4ef95dc277b9d4a757f3d8201e3a47abbdcb0df4 100644 (file)
--- 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 d6c89012a9db9c79663024d925b78041bbab1a99..32da771c9e46e75c147c9917ecd8cc724c90087f 100644 (file)
--- 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 342ce5f9ca5393d58822543770a161eb166d50b0..d2a5ee12eb32c67a7470b77de9f8aea35436c2cf 100644 (file)
--- 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 f40141f23b5f159cdc6fb8d731d54da3c6319764..1befd6f01e5e405e00eff730b4bc256c448bf022 100644 (file)
--- 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:}