Skip to content

Commit

Permalink
qa: Add testing osd-configrations
Browse files Browse the repository at this point in the history
qa: add README to clarify

Signed-off-by: Joshua Schmid <[email protected]>
  • Loading branch information
Joshua Schmid committed Jul 27, 2018
1 parent 21a252f commit e368cda
Show file tree
Hide file tree
Showing 22 changed files with 319 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ copy-files:
install -m 600 srv/salt/ceph/salt-api/files/sharedsecret.conf.j2 $(DESTDIR)/etc/salt/master.d/sharedsecret.conf
# qa
install -d -m 755 $(DESTDIR)/usr/lib/deepsea/qa/common
install -d -m 755 $(DESTDIR)/usr/lib/deepsea/qa/osd-config/ovh
install -d -m 755 $(DESTDIR)/usr/lib/deepsea/qa/suites/basic
install -d -m 755 $(DESTDIR)/usr/lib/deepsea/qa/suites/ceph-test
install -m 644 qa/README $(DESTDIR)/usr/lib/deepsea/qa/
install -m 644 qa/common/*.sh $(DESTDIR)/usr/lib/deepsea/qa/common/
install -m 644 qa/osd-config/ovh/*.yaml $(DESTDIR)/usr/lib/deepsea/qa/osd-config/ovh/
install -m 755 qa/suites/basic/*.sh $(DESTDIR)/usr/lib/deepsea/qa/suites/basic/
install -m 755 qa/suites/ceph-test/*.sh $(DESTDIR)/usr/lib/deepsea/qa/suites/ceph-test/
# tests
Expand Down
24 changes: 24 additions & 0 deletions qa/osd-config/ovh/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
These files contain all the permuations for possible OSD configrations.

The files were generated according to the following matrix.



+-------------+ +------------+ +------------------+ +-------------------------+
| | | | | | | |
| | | | | | | |
| | | db | | encrypted | | all have sizes |
| bluestore +--------> wal +---------> not encrypted +------> mixed size definition |
| | | db_wal | | | | none have size defined |
| | | | | | | |
| | | | | | | |
+-------------+ +------------+ +------------------+ +-------------------------+


+-------------+ +------------+ +-----------------+
| | | | | |
| filestore +--------> journal +--------> encrypted |
| | | | | not encrypted |
| | | | | |
+-------------+ +------------+ +-----------------+

12 changes: 12 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
db: /dev/vde
/dev/vdc:
format: bluestore
db: /dev/vde
/dev/vdd:
format: bluestore
db: /dev/vde
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
db: /dev/vde
/dev/vdc:
format: bluestore
encryption: dmcrypt
db: /dev/vde
/dev/vdd:
format: bluestore
encryption: dmcrypt
db: /dev/vde
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db_sizes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
db: /dev/vde
db_size: 1G
/dev/vdc:
format: bluestore
db: /dev/vde
db_size: 2G
/dev/vdd:
format: bluestore
db: /dev/vde
db_size: 3G
18 changes: 18 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db_sizes_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
db: /dev/vde
db_size: 1G
/dev/vdc:
format: bluestore
encryption: dmcrypt
db: /dev/vde
db_size: 2G
/dev/vdd:
format: bluestore
encryption: dmcrypt
db: /dev/vde
db_size: 3G
14 changes: 14 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db_sizes_mixed.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
db: /dev/vde
db_size: 1G
/dev/vdc:
format: bluestore
db: /dev/vde
db_size: 2G
/dev/vdd:
format: bluestore
db: /dev/vde
17 changes: 17 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_db_sizes_mixed_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
db: /dev/vde
db_size: 1G
/dev/vdc:
format: bluestore
encryption: dmcrypt
db: /dev/vde
db_size: 2G
/dev/vdd:
format: bluestore
encryption: dmcrypt
db: /dev/vde
12 changes: 12 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal: /dev/vde
/dev/vdc:
format: bluestore
wal: /dev/vde
/dev/vdd:
format: bluestore
wal: /dev/vde
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
/dev/vdd:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
11 changes: 11 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal: /dev/vde
db: /dev/vdd
/dev/vdc:
format: bluestore
wal: /dev/vde
db: /dev/vdd
13 changes: 13 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
db: /dev/vdd
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
db: /dev/vdd
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db_sizes_all.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal_size: 1G
wal: /dev/vde
db: /dev/vdd
db_size: 2G
/dev/vdc:
format: bluestore
wal: /dev/vde
db: /dev/vdd
wal_size: 3G
db_size: 4G
17 changes: 17 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db_sizes_all_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal_size: 1G
wal: /dev/vde
db: /dev/vdd
db_size: 2G
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
db: /dev/vdd
wal_size: 3G
db_size: 4G
13 changes: 13 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db_sizes_mixed.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal: /dev/vde
db: /dev/vdd
/dev/vdc:
format: bluestore
wal: /dev/vde
db: /dev/vdd
wal_size: 3G
db_size: 4G
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_db_sizes_mixed_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
db: /dev/vdd
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
db: /dev/vdd
wal_size: 3G
db_size: 4G
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_sizes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal_size: 1G
wal: /dev/vde
/dev/vdc:
format: bluestore
wal: /dev/vde
wal_size: 2G
/dev/vdd:
format: bluestore
wal: /dev/vde
wal_size: 3G
18 changes: 18 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_sizes_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal_size: 1G
wal: /dev/vde
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
wal_size: 2G
/dev/vdd:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
wal_size: 3G
14 changes: 14 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_sizes_mixed.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
wal_size: 1G
wal: /dev/vde
/dev/vdc:
format: bluestore
wal: /dev/vde
wal_size: 2G
/dev/vdd:
format: bluestore
wal: /dev/vde
17 changes: 17 additions & 0 deletions qa/osd-config/ovh/bs_dedicated_wal_sizes_mixed_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ceph:
storage:
osds:
/dev/vdb:
format: bluestore
encryption: dmcrypt
wal_size: 1G
wal: /dev/vde
/dev/vdc:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
wal_size: 2G
/dev/vdd:
format: bluestore
encryption: dmcrypt
wal: /dev/vde
12 changes: 12 additions & 0 deletions qa/osd-config/ovh/fs_dedicated_journal.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ceph:
storage:
osds:
/dev/vdb:
format: filestore
journal: /dev/vde
/dev/vdc:
format: filestore
journal: /dev/vde
/dev/vdd:
format: filestore
journal: /dev/vde
15 changes: 15 additions & 0 deletions qa/osd-config/ovh/fs_dedicated_journal_crypt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ceph:
storage:
osds:
/dev/vdb:
format: filestore
encryption: dmcrypt
journal: /dev/vde
/dev/vdc:
format: filestore
encryption: dmcrypt
journal: /dev/vde
/dev/vdd:
format: filestore
encryption: dmcrypt
journal: /dev/vde

0 comments on commit e368cda

Please sign in to comment.