Separate the main task from options

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 60d00e0eadda3a7a7cfbac2acdc81a4d55a27570)

diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml
deleted file mode 100644 (file)
index e7e8cda..0000000
--- a/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-meta:
-- desc: "Build the ceph cluster using ceph-ansible"
-
-overrides:
-   ceph_ansible:
-     vars:
-        ceph_conf_overrides:
-          global:
-            osd default pool size: 2
-            mon pg warn min per osd: 2
-        ceph_dev: true
-        ceph_dev_key: https://download.ceph.com/keys/autobuild.asc
-        ceph_origin: upstream
-        ceph_test: true
-        ceph_stable_release: luminous
-        osd_scenario: collocated
-        journal_size: 1024
-        osd_auto_discovery: false
-
-tasks:
-- ssh-keys:
-- ceph_ansible:
-- install.ship_utilities:

diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml
new file mode 100644 (file)
index 0000000..4bbd1c7
--- /dev/null
+++ b/qa/suites/ceph-ansible/smoke/basic/2-config/dmcrypt_off.yaml
@@ -0,0 +1,7 @@
+meta:
+- desc: "without dmcrypt"
+
+overrides:
+   ceph_ansible:
+     vars:
+        dmcrypt: False

diff --git a/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml
new file mode 100644 (file)
index 0000000..e7e8cda
--- /dev/null
+++ b/qa/suites/ceph-ansible/smoke/basic/ceph_ansible.yaml
@@ -0,0 +1,23 @@
+meta:
+- desc: "Build the ceph cluster using ceph-ansible"
+
+overrides:
+   ceph_ansible:
+     vars:
+        ceph_conf_overrides:
+          global:
+            osd default pool size: 2
+            mon pg warn min per osd: 2
+        ceph_dev: true
+        ceph_dev_key: https://download.ceph.com/keys/autobuild.asc
+        ceph_origin: upstream
+        ceph_test: true
+        ceph_stable_release: luminous
+        osd_scenario: collocated
+        journal_size: 1024
+        osd_auto_discovery: false
+
+tasks:
+- ssh-keys:
+- ceph_ansible:
+- install.ship_utilities: