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

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

diff --git a/qa/suites/ceph-deploy/% b/qa/suites/ceph-deploy/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/ceph-deploy/basic/% b/qa/suites/ceph-deploy/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/ceph-deploy/basic/.qa b/qa/suites/ceph-deploy/basic/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/ceph-deploy/basic/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

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 (file)
index 859a37f..0000000
--- 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 (file)
index 5c998c5..0000000
--- 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 (file)
index ea3f634..0000000
--- 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 (file)
index 59cb799..0000000
--- 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/.qa b/qa/suites/ceph-deploy/basic/config_options/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/ceph-deploy/basic/config_options/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

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 (file)
index 7f9f0b7..0000000
--- 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/distros/.qa b/qa/suites/ceph-deploy/basic/distros/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/ceph-deploy/basic/distros/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml b/qa/suites/ceph-deploy/basic/distros/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/ceph-deploy/basic/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/basic/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml
deleted file mode 120000 (symlink)
index 3a09f9a..0000000
--- a/qa/suites/ceph-deploy/basic/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/basic/objectstore/.qa b/qa/suites/ceph-deploy/basic/objectstore/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/ceph-deploy/basic/objectstore/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml b/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml
deleted file mode 120000 (symlink)
index 961c6c6..0000000
--- 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 (symlink)
index 41f2a9d..0000000
--- 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 (symlink)
index a602a03..0000000
--- 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/python_versions/python_2.yaml b/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml
deleted file mode 100644 (file)
index 51c865b..0000000
--- a/qa/suites/ceph-deploy/basic/python_versions/python_2.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph-deploy:
-    python_version: "2"

diff --git a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml b/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml
deleted file mode 100644 (file)
index 22deeca..0000000
--- a/qa/suites/ceph-deploy/basic/python_versions/python_3.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph-deploy:
-    python_version: "3"

diff --git a/qa/suites/ceph-deploy/basic/tasks/.qa b/qa/suites/ceph-deploy/basic/tasks/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- 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/basic/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
deleted file mode 100644 (file)
index 967ce80..0000000
--- a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-openstack:
-  - machine:
-      disk: 10
-    volumes:
-      count: 2
-      size: 110
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-- - osd.1
-  - mon.b
-  - client.0
-tasks:
-- ssh_keys:
-- print: "**** done ssh_keys"
-- ceph-deploy:
-- print: "**** done ceph-deploy"
-- workunit:
-     clients:
-        client.0:
-           - ceph-tests/ceph-admin-commands.sh
-- print: "**** done ceph-tests/ceph-admin-commands.sh"

diff --git a/qa/suites/ceph-deploy/ceph-volume/% b/qa/suites/ceph-deploy/ceph-volume/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/ceph-deploy/ceph-volume/.qa b/qa/suites/ceph-deploy/ceph-volume/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- 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 (symlink)
index a602a03..0000000
--- 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/cluster/4node.yaml b/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
deleted file mode 100644 (file)
index bf4a7f9..0000000
--- a/qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
- ansible.cephlab: 
-  vars: 
-   quick_lvs_to_create: 4
-openstack:
-  - machine:
-      disk: 10
-    volumes:
-      count: 4
-      size: 20
-roles:
-- [mon.a, mgr.y, osd.0, osd.1]
-- [mon.b, osd.2, osd.3]
-- [mon.c, osd.4, osd.5]
-- [mgr.x, client.0]

diff --git a/qa/suites/ceph-deploy/ceph-volume/config/.qa b/qa/suites/ceph-deploy/ceph-volume/config/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- 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/config/ceph_volume_dmcrypt_off.yaml b/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml
deleted file mode 100644 (file)
index 0970144..0000000
--- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      use-ceph-volume: True

diff --git a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml b/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml
deleted file mode 100644 (file)
index d718563..0000000
--- a/qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-overrides:
-   ceph-deploy:
-      use-ceph-volume: True
-      filestore: True

diff --git a/qa/suites/ceph-deploy/ceph-volume/distros/.qa b/qa/suites/ceph-deploy/ceph-volume/distros/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- 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 (symlink)
index bd9854e..0000000
--- 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 (symlink)
index 3a09f9a..0000000
--- 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 (symlink)
index a602a03..0000000
--- 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/ceph-volume/tasks/rbd_import_export.yaml b/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml
deleted file mode 100644 (file)
index 1c09735..0000000
--- a/qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: "Setup cluster using ceph-deploy, Run the rbd import/export tests"
-tasks:
-- ssh-keys:
-- ceph-deploy:
-- workunit:
-    clients:
-      client.0:
-        - rbd/import_export.sh

diff --git a/qa/suites/ceph-deploy/cluster/.qa b/qa/suites/ceph-deploy/cluster/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/ceph-deploy/cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/cluster/4node.yaml b/qa/suites/ceph-deploy/cluster/4node.yaml
new file mode 100644 (file)
index 0000000..bf4a7f9
--- /dev/null
+++ b/qa/suites/ceph-deploy/cluster/4node.yaml
@@ -0,0 +1,15 @@
+overrides:
+ ansible.cephlab: 
+  vars: 
+   quick_lvs_to_create: 4
+openstack:
+  - machine:
+      disk: 10
+    volumes:
+      count: 4
+      size: 20
+roles:
+- [mon.a, mgr.y, osd.0, osd.1]
+- [mon.b, osd.2, osd.3]
+- [mon.c, osd.4, osd.5]
+- [mgr.x, client.0]

diff --git a/qa/suites/ceph-deploy/config/.qa b/qa/suites/ceph-deploy/config/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/ceph-deploy/config/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

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 (file)
index 0000000..e484e61
--- /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 (file)
index 0000000..d424b64
--- /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/config/ceph_volume_dmcrypt_off.yaml b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml
new file mode 100644 (file)
index 0000000..0970144
--- /dev/null
+++ b/qa/suites/ceph-deploy/config/ceph_volume_dmcrypt_off.yaml
@@ -0,0 +1,3 @@
+overrides:
+   ceph-deploy:
+      use-ceph-volume: True

diff --git a/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml
new file mode 100644 (file)
index 0000000..d718563
--- /dev/null
+++ b/qa/suites/ceph-deploy/config/ceph_volume_filestore.yaml
@@ -0,0 +1,4 @@
+overrides:
+   ceph-deploy:
+      use-ceph-volume: True
+      filestore: True

diff --git a/qa/suites/ceph-deploy/distros/.qa b/qa/suites/ceph-deploy/distros/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/ceph-deploy/distros/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/distros/centos_latest.yaml b/qa/suites/ceph-deploy/distros/centos_latest.yaml
new file mode 120000 (symlink)
index 0000000..bd9854e
--- /dev/null
+++ b/qa/suites/ceph-deploy/distros/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml
new file mode 120000 (symlink)
index 0000000..3a09f9a
--- /dev/null
+++ b/qa/suites/ceph-deploy/distros/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/python_versions/.qa b/qa/suites/ceph-deploy/python_versions/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/ceph-deploy/python_versions/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/python_versions/python_2.yaml b/qa/suites/ceph-deploy/python_versions/python_2.yaml
new file mode 100644 (file)
index 0000000..51c865b
--- /dev/null
+++ b/qa/suites/ceph-deploy/python_versions/python_2.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph-deploy:
+    python_version: "2"

diff --git a/qa/suites/ceph-deploy/python_versions/python_3.yaml b/qa/suites/ceph-deploy/python_versions/python_3.yaml
new file mode 100644 (file)
index 0000000..22deeca
--- /dev/null
+++ b/qa/suites/ceph-deploy/python_versions/python_3.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph-deploy:
+    python_version: "3"

diff --git a/qa/suites/ceph-deploy/tasks/.qa b/qa/suites/ceph-deploy/tasks/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/ceph-deploy/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml
new file mode 100644 (file)
index 0000000..b7dbfe1
--- /dev/null
+++ b/qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: "test basic ceph admin commands"
+tasks:
+- ssh_keys:
+- print: "**** done ssh_keys"
+- ceph-deploy:
+- print: "**** done ceph-deploy"
+- workunit:
+     clients:
+        client.0:
+           - ceph-tests/ceph-admin-commands.sh
+- print: "**** done ceph-tests/ceph-admin-commands.sh"

diff --git a/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..1c09735
--- /dev/null
+++ b/qa/suites/ceph-deploy/tasks/rbd_import_export.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: "Setup cluster using ceph-deploy, Run the rbd import/export tests"
+tasks:
+- ssh-keys:
+- ceph-deploy:
+- workunit:
+    clients:
+      client.0:
+        - rbd/import_export.sh