From 12a1ceba6ef89c1e42c394e228e2012fb89f44fc Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Tue, 25 Jul 2017 11:48:10 -0700 Subject: [PATCH] Move ceph-deploy config options into its own folder The old structure of link at top folder is pretty much outdated, the test config option needs to be specific to cluster yaml. Signed-off-by: Vasu Kulkarni --- qa/suites/ceph-deploy/basic/ceph-deploy-overrides | 1 - .../basic}/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml | 0 .../basic}/ceph-deploy-overrides/disable_diff_journal_disk.yaml | 0 .../basic}/ceph-deploy-overrides/enable_diff_journal_disk.yaml | 0 .../ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml | 0 qa/suites/ceph-deploy/basic/config_options | 1 - .../ceph-deploy/basic}/config_options/cephdeploy_conf.yaml | 0 7 files changed, 2 deletions(-) delete mode 120000 qa/suites/ceph-deploy/basic/ceph-deploy-overrides rename qa/{ => suites/ceph-deploy/basic}/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml (100%) rename qa/{ => suites/ceph-deploy/basic}/ceph-deploy-overrides/disable_diff_journal_disk.yaml (100%) rename qa/{ => suites/ceph-deploy/basic}/ceph-deploy-overrides/enable_diff_journal_disk.yaml (100%) rename qa/{ => suites/ceph-deploy/basic}/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml (100%) delete mode 120000 qa/suites/ceph-deploy/basic/config_options rename qa/{ => suites/ceph-deploy/basic}/config_options/cephdeploy_conf.yaml (100%) diff --git a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides deleted file mode 120000 index 3954c75a78919..0000000000000 --- a/qa/suites/ceph-deploy/basic/ceph-deploy-overrides +++ /dev/null @@ -1 +0,0 @@ -../../../ceph-deploy-overrides \ No newline at end of file diff --git a/qa/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml similarity index 100% rename from qa/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml rename to qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml diff --git a/qa/ceph-deploy-overrides/disable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml similarity index 100% rename from qa/ceph-deploy-overrides/disable_diff_journal_disk.yaml rename to qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml diff --git a/qa/ceph-deploy-overrides/enable_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml similarity index 100% rename from qa/ceph-deploy-overrides/enable_diff_journal_disk.yaml rename to qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml diff --git a/qa/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml similarity index 100% rename from qa/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml rename to qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml diff --git a/qa/suites/ceph-deploy/basic/config_options b/qa/suites/ceph-deploy/basic/config_options deleted file mode 120000 index 50bcdbe600e19..0000000000000 --- a/qa/suites/ceph-deploy/basic/config_options +++ /dev/null @@ -1 +0,0 @@ -../../../config_options \ No newline at end of file diff --git a/qa/config_options/cephdeploy_conf.yaml b/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml similarity index 100% rename from qa/config_options/cephdeploy_conf.yaml rename to qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml -- 2.39.5