From: Vasu Kulkarni <vasu@redhat.com>
Date: Tue, 25 Jul 2017 18:48:10 +0000 (-0700)
Subject: Move ceph-deploy config options into its own folder
X-Git-Tag: v12.1.2~96^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12a1ceba6ef89c1e42c394e228e2012fb89f44fc;p=ceph.git

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 <vasu@redhat.com>
---

diff --git a/qa/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml b/qa/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
deleted file mode 100644
index 859a37faa886..000000000000
--- a/qa/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      dmcrypt: yes
diff --git a/qa/ceph-deploy-overrides/disable_diff_journal_disk.yaml b/qa/ceph-deploy-overrides/disable_diff_journal_disk.yaml
deleted file mode 100644
index 5c998c512d3b..000000000000
--- a/qa/ceph-deploy-overrides/disable_diff_journal_disk.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-   ceph-deploy:
-      separate_journal_disk:
diff --git a/qa/ceph-deploy-overrides/enable_diff_journal_disk.yaml b/qa/ceph-deploy-overrides/enable_diff_journal_disk.yaml
deleted file mode 100644
index ea3f63415df8..000000000000
--- a/qa/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/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml b/qa/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml
deleted file mode 100644
index 59cb799726eb..000000000000
--- a/qa/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/config_options/cephdeploy_conf.yaml b/qa/config_options/cephdeploy_conf.yaml
deleted file mode 100644
index 7f9f0b797d3b..000000000000
--- a/qa/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/ceph-deploy-overrides b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides
deleted file mode 120000
index 3954c75a7891..000000000000
--- 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/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
new file mode 100644
index 000000000000..859a37faa886
--- /dev/null
+++ b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..5c998c512d3b
--- /dev/null
+++ b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/disable_diff_journal_disk.yaml
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..ea3f63415df8
--- /dev/null
+++ b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_diff_journal_disk.yaml
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..59cb799726eb
--- /dev/null
+++ b/qa/suites/ceph-deploy/basic/ceph-deploy-overrides/enable_dmcrypt_diff_journal_disk.yaml
@@ -0,0 +1,4 @@
+overrides:
+   ceph-deploy:
+      dmcrypt: yes
+      separate_journal_disk: yes
diff --git a/qa/suites/ceph-deploy/basic/config_options b/qa/suites/ceph-deploy/basic/config_options
deleted file mode 120000
index 50bcdbe600e1..000000000000
--- 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/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml b/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml
new file mode 100644
index 000000000000..7f9f0b797d3b
--- /dev/null
+++ b/qa/suites/ceph-deploy/basic/config_options/cephdeploy_conf.yaml
@@ -0,0 +1,6 @@
+overrides:
+   ceph-deploy:
+      conf:
+         global:
+             mon pg warn min per osd: 2
+             osd pool default size: 2