From ff1f97e276acf763c8d424fcd993c594dc9d6b0c Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Fri, 6 Jul 2018 15:03:17 -0700 Subject: [PATCH] qa/tests: remove ceph-disk tests and default all tests to use ceph-volume Signed-off-by: Vasu Kulkarni --- qa/suites/ceph-deploy/{basic => }/% | 0 .../ceph_deploy_dmcrypt.yaml | 3 --- .../disable_diff_journal_disk.yaml | 3 --- .../enable_diff_journal_disk.yaml | 3 --- .../enable_dmcrypt_diff_journal_disk.yaml | 4 ---- .../basic/config_options/cephdeploy_conf.yaml | 6 ------ .../ceph-deploy/basic/objectstore/bluestore.yaml | 1 - .../basic/objectstore/filestore-xfs.yaml | 1 - qa/suites/ceph-deploy/basic/python_versions/.qa | 1 - qa/suites/ceph-deploy/basic/tasks/.qa | 1 - qa/suites/ceph-deploy/ceph-volume/% | 0 qa/suites/ceph-deploy/ceph-volume/.qa | 1 - qa/suites/ceph-deploy/ceph-volume/cluster/.qa | 1 - qa/suites/ceph-deploy/ceph-volume/config/.qa | 1 - qa/suites/ceph-deploy/ceph-volume/distros/.qa | 1 - .../ceph-volume/distros/centos_latest.yaml | 1 - .../ceph-volume/distros/ubuntu_latest.yaml | 1 - qa/suites/ceph-deploy/ceph-volume/tasks/.qa | 1 - qa/suites/ceph-deploy/{basic => cluster}/.qa | 0 .../{ceph-volume => }/cluster/4node.yaml | 0 .../{basic/ceph-deploy-overrides => config}/.qa | 0 .../config/ceph_volume_bluestore.yaml | 7 +++++++ .../config/ceph_volume_bluestore_dmcrypt.yaml | 8 ++++++++ .../config/ceph_volume_dmcrypt_off.yaml | 0 .../config/ceph_volume_filestore.yaml | 0 .../{basic/config_options => distros}/.qa | 0 .../{basic => }/distros/centos_latest.yaml | 0 .../{basic => }/distros/ubuntu_latest.yaml | 0 .../{basic/distros => python_versions}/.qa | 0 .../{basic => }/python_versions/python_2.yaml | 0 .../{basic => }/python_versions/python_3.yaml | 0 .../ceph-deploy/{basic/objectstore => tasks}/.qa | 0 .../{basic => }/tasks/ceph-admin-commands.yaml | 16 ++-------------- .../tasks/rbd_import_export.yaml | 0 34 files changed, 17 insertions(+), 44 deletions(-) rename qa/suites/ceph-deploy/{basic => }/% (100%) delete mode 100644 qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml delete mode 100644 qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml delete mode 100644 qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml delete mode 100644 qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml delete mode 100644 qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml delete mode 120000 qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml delete mode 120000 qa/suites/ceph-deploy/basic/objectstore/filestore-xfs.yaml delete mode 120000 qa/suites/ceph-deploy/basic/python_versions/.qa delete mode 120000 qa/suites/ceph-deploy/basic/tasks/.qa delete mode 100644 qa/suites/ceph-deploy/ceph-volume/% delete mode 120000 qa/suites/ceph-deploy/ceph-volume/.qa delete mode 120000 qa/suites/ceph-deploy/ceph-volume/cluster/.qa delete mode 120000 qa/suites/ceph-deploy/ceph-volume/config/.qa delete mode 120000 qa/suites/ceph-deploy/ceph-volume/distros/.qa delete mode 120000 qa/suites/ceph-deploy/ceph-volume/distros/centos_latest.yaml delete mode 120000 qa/suites/ceph-deploy/ceph-volume/distros/ubuntu_latest.yaml delete mode 120000 qa/suites/ceph-deploy/ceph-volume/tasks/.qa rename qa/suites/ceph-deploy/{basic => cluster}/.qa (100%) rename qa/suites/ceph-deploy/{ceph-volume => }/cluster/4node.yaml (100%) rename qa/suites/ceph-deploy/{basic/ceph-deploy-overrides => config}/.qa (100%) create mode 100644 qa/suites/ceph-deploy/config/ceph_volume_bluestore.yaml create mode 100644 qa/suites/ceph-deploy/config/ceph_volume_bluestore_dmcrypt.yaml rename qa/suites/ceph-deploy/{ceph-volume => }/config/ceph_volume_dmcrypt_off.yaml (100%) rename qa/suites/ceph-deploy/{ceph-volume => }/config/ceph_volume_filestore.yaml (100%) rename qa/suites/ceph-deploy/{basic/config_options => distros}/.qa (100%) rename qa/suites/ceph-deploy/{basic => }/distros/centos_latest.yaml (100%) rename qa/suites/ceph-deploy/{basic => }/distros/ubuntu_latest.yaml (100%) rename qa/suites/ceph-deploy/{basic/distros => python_versions}/.qa (100%) rename qa/suites/ceph-deploy/{basic => }/python_versions/python_2.yaml (100%) rename qa/suites/ceph-deploy/{basic => }/python_versions/python_3.yaml (100%) rename qa/suites/ceph-deploy/{basic/objectstore => tasks}/.qa (100%) rename qa/suites/ceph-deploy/{basic => }/tasks/ceph-admin-commands.yaml (59%) rename qa/suites/ceph-deploy/{ceph-volume => }/tasks/rbd_import_export.yaml (100%) diff --git a/qa/suites/ceph-deploy/basic/% b/qa/suites/ceph-deploy/% similarity index 100% rename from qa/suites/ceph-deploy/basic/% rename to 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 859a37faa886a..0000000000000 --- 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 5c998c512d3bb..0000000000000 --- 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 ea3f63415df8d..0000000000000 --- 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 59cb799726eb3..0000000000000 --- 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 7f9f0b797d3bc..0000000000000 --- 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 961c6c6ac3f8e..0000000000000 --- 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 41f2a9d14db8e..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 e69de29bb2d1d..0000000000000 diff --git a/qa/suites/ceph-deploy/ceph-volume/.qa b/qa/suites/ceph-deploy/ceph-volume/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 bd9854e702982..0000000000000 --- 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 3a09f9abb05ca..0000000000000 --- 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 a602a0353e751..0000000000000 --- 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/.qa rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/ceph-volume/cluster/4node.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa rename to 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 0000000000000..e484e612035c2 --- /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 0000000000000..d424b64234765 --- /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 similarity index 100% rename from qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_dmcrypt_off.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/ceph-volume/config/ceph_volume_filestore.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/config_options/.qa rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/distros/centos_latest.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/distros/.qa rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/python_versions/python_2.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/python_versions/python_3.yaml rename to 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 similarity index 100% rename from qa/suites/ceph-deploy/basic/objectstore/.qa rename to 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 similarity index 59% rename from qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml rename to qa/suites/ceph-deploy/tasks/ceph-admin-commands.yaml index 967ce802f92d6..b7dbfe1ae82eb 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 similarity index 100% rename from qa/suites/ceph-deploy/ceph-volume/tasks/rbd_import_export.yaml rename to qa/suites/ceph-deploy/tasks/rbd_import_export.yaml -- 2.39.5