qa/tests: remove ceph-disk tests and default all tests to use ceph-volume

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

34 files changed, 17 insertions, 44 deletions

diff --git a/qa/suites/ceph-deploy/basic/% b/qa/suites/ceph-deploy/%
index e69de29bb2d..e69de29bb2d 100644
--- a/qa/suites/ceph-deploy/basic/%
+++ b/qa/suites/ceph-deploy/%
diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
deleted file mode 100644
index 859a37faa88..00000000000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      dmcrypt: yes
diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml
deleted file mode 100644
index 5c998c512d3..00000000000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      separate_journal_disk:
diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml
deleted file mode 100644
index ea3f63415df..00000000000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      separate_journal_disk: yes
diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml
deleted file mode 100644
index 59cb799726e..00000000000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-overrides:
-   ceph-deploy:
-      dmcrypt: yes
-      separate_journal_disk: yes
diff --git a/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml b/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml
deleted file mode 100644
index 7f9f0b797d3..00000000000
--- a/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-   ceph-deploy:
-      conf:
-         global:
-             mon pg warn min per osd: 2
-             osd pool default size: 2
diff --git a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml b/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml
deleted file mode 120000
index 961c6c6ac3f..00000000000
--- a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore/bluestore.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml b/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml
deleted file mode 120000
index 41f2a9d14db..00000000000
--- a/qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore/filestore-xfs.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/basic/python_versions/.qa b/qa/suites/ceph-deploy/basic/python_versions/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/basic/python_versions/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/basic/tasks/.qa b/qa/suites/ceph-deploy/basic/tasks/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/basic/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/% b/qa/suites/ceph-deploy/ceph-volume/%
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/%
+++ /dev/null
diff --git a/qa/suites/ceph-deploy/ceph-volume/.qa b/qa/suites/ceph-deploy/ceph-volume/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/cluster/.qa b/qa/suites/ceph-deploy/ceph-volume/cluster/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/config/.qa b/qa/suites/ceph-deploy/ceph-volume/config/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/config/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/.qa b/qa/suites/ceph-deploy/ceph-volume/distros/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/distros/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml b/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml
deleted file mode 120000
index bd9854e7029..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml
deleted file mode 120000
index 3a09f9abb05..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/ceph-volume/tasks/.qa b/qa/suites/ceph-deploy/ceph-volume/tasks/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/ceph-deploy/ceph-volume/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/ceph-deploy/basic/.qa b/qa/suites/ceph-deploy/cluster/.qa
index a602a0353e7..a602a0353e7 120000
--- a/qa/suites/ceph-deploy/basic/.qa
+++ b/qa/suites/ceph-deploy/cluster/.qa
diff --git a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml b/qa/suites/ceph-deploy/cluster/4node.yaml
index bf4a7f98695..bf4a7f98695 100644
--- a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
+++ b/qa/suites/ceph-deploy/cluster/4node.yaml
diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa b/qa/suites/ceph-deploy/config/.qa
index a602a0353e7..a602a0353e7 120000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa
+++ b/qa/suites/ceph-deploy/config/.qa
diff --git a/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml b/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml
new file mode 100644
index 00000000000..e484e612035
--- /dev/null
+++ b/qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml
@@ -0,0 +1,7 @@
+overrides:
+   ceph-deploy:
+      use-ceph-volume: True
+      bluestore: True
+      conf:
+        osd:
+          bluestore fsck on mount: true
diff --git a/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml b/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml
new file mode 100644
index 00000000000..d424b642347
--- /dev/null
+++ b/qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml
@@ -0,0 +1,8 @@
+overrides:
+   ceph-deploy:
+      use-ceph-volume: True
+      bluestore: True
+      dmcrypt: True
+      conf:
+        osd:
+          bluestore fsck on mount: true
diff --git a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml
index 09701441498..09701441498 100644
--- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml
+++ b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml
diff --git a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml
index d7185631450..d7185631450 100644
--- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml
+++ b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml
diff --git a/qa/suites/ceph-deploy/basic/config_options/.qa b/qa/suites/ceph-deploy/distros/.qa
index a602a0353e7..a602a0353e7 120000
--- a/qa/suites/ceph-deploy/basic/config_options/.qa
+++ b/qa/suites/ceph-deploy/distros/.qa
diff --git a/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml b/qa/suites/ceph-deploy/distros/centos_latest.yaml
index bd9854e7029..bd9854e7029 120000
--- a/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml
+++ b/qa/suites/ceph-deploy/distros/centos_latest.yaml
diff --git a/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml
index 3a09f9abb05..3a09f9abb05 120000
--- a/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml
+++ b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml
diff --git a/qa/suites/ceph-deploy/basic/distros/.qa b/qa/suites/ceph-deploy/python_versions/.qa
index a602a0353e7..a602a0353e7 120000
--- a/qa/suites/ceph-deploy/basic/distros/.qa
+++ b/qa/suites/ceph-deploy/python_versions/.qa
diff --git a/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml b/qa/suites/ceph-deploy/python_versions/python_2.yaml
index 51c865bfa87..51c865bfa87 100644
--- a/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml
+++ b/qa/suites/ceph-deploy/python_versions/python_2.yaml
diff --git a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml b/qa/suites/ceph-deploy/python_versions/python_3.yaml
index 22deecaeab6..22deecaeab6 100644
--- a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml
+++ b/qa/suites/ceph-deploy/python_versions/python_3.yaml
diff --git a/qa/suites/ceph-deploy/basic/objectstore/.qa b/qa/suites/ceph-deploy/tasks/.qa
index a602a0353e7..a602a0353e7 120000
--- a/qa/suites/ceph-deploy/basic/objectstore/.qa
+++ b/qa/suites/ceph-deploy/tasks/.qa
diff --git a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml
index 967ce802f92..b7dbfe1ae82 100644
--- a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
+++ b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml
@@ -1,17 +1,5 @@
-openstack:
-  - machine:
-      disk: 10
-    volumes:
-      count: 2
-      size: 110
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-- - osd.1
-  - mon.b
-  - client.0
+meta:
+- desc: "test basic ceph admin commands"
 tasks:
 - ssh_keys:
 - print: "**** done ssh_keys"
diff --git a/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml
index 1c09735a6bc..1c09735a6bc 100644
--- a/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml
+++ b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml