tests: refact shrink_osd scenario

This adds more coverage on the shrink_osd scenario.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 7efea219d62792c599b9d66035395323334beeaa)

diff --git a/tests/functional/shrink_osd/container/group_vars/osds b/tests/functional/shrink_osd/container/group_vars/osds
index c9149bd5017a82166cbbb4806a84e4124b7f1a3a..e441fd8c8a1f145478a2046011d8cee5fa070e77 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/osds
+++ b/tests/functional/shrink_osd/container/group_vars/osds
@@ -1,11 +1,2 @@
 ---
 journal_size: 100
-osd_objectstore: "filestore"
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals

diff --git a/tests/functional/shrink_osd/container/hosts b/tests/functional/shrink_osd/container/hosts
index 458c66a844eebf703e5c2850da140f105c6c266c..421d2875ea3eaa5fa72f614471b788f6e61f7206 100644 (file)
--- a/tests/functional/shrink_osd/container/hosts
+++ b/tests/functional/shrink_osd/container/hosts
@@ -2,6 +2,7 @@
 mon0
 
 [osds]
-osd0
-osd1
-osd2
+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
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/vagrant_variables.yml b/tests/functional/shrink_osd/container/vagrant_variables.yml
index f9575a7c7e2c8d50de878b8afec5a81ad262f61b..1214e00a2ff16209843b70ab27420715295783af 100644 (file)
--- a/tests/functional/shrink_osd/container/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/container/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: True
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 3
+osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0

diff --git a/tests/functional/shrink_osd/group_vars/osds b/tests/functional/shrink_osd/group_vars/osds
index 59fd2abf8450c436d2b2412867ca5decb2a47f59..bae7ce267015e16dc15cdcaa037403dfd56299f2 100644 (file)
--- a/tests/functional/shrink_osd/group_vars/osds
+++ b/tests/functional/shrink_osd/group_vars/osds
@@ -2,12 +2,3 @@
 os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 journal_size: 100
-osd_objectstore: "filestore"
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals

diff --git a/tests/functional/shrink_osd/hosts b/tests/functional/shrink_osd/hosts
index 997e8108dbf9684d486b20e787081bbe3ad2912d..3ec73c825a0e195a24bf47d0b66c8629e1931bf7 100644 (file)
--- a/tests/functional/shrink_osd/hosts
+++ b/tests/functional/shrink_osd/hosts
@@ -2,6 +2,7 @@
 mon0 monitor_address=192.168.71.10
 
 [osds]
-osd0
-osd1
-osd2
+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/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml
index 208a28f98ea8c9f479652dee5c7642de14dd781e..eb5e9350b0c55545504d88e9bac1dc6155ea3878 100644 (file)
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 3
+osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0