Catchup with recent changes with ceph-ansible

Adds osd_scenario and ceph_stable_release variables

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

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
index 5750d52bc918fb70d6caa9aa90bcda599a1a415d..e7e8cda4736fd36ba74a6059292eaed37ac7b540 100644 (file)
--- a/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml
@@ -1,20 +1,21 @@
 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                                                                                                                                                                                     
-        journal_collocation: true                                                                                                                                                                           
-        journal_size: 1024                                                                                                                                                                                  
-        osd_auto_discovery: false           
+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: