From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 7 Sep 2017 00:06:36 +0000 (-0700)
Subject: Add osd_scenario required var for ceph-ansible tests
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=be60a5127c48d2bb64f11879642b8529796263c4;p=ceph.git

Add osd_scenario required var for ceph-ansible tests

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

diff --git a/qa/suites/smoke/calamari-api/lite.yaml b/qa/suites/smoke/calamari-api/lite.yaml
index a512075846a17..3be6719cd348f 100644
--- a/qa/suites/smoke/calamari-api/lite.yaml
+++ b/qa/suites/smoke/calamari-api/lite.yaml
@@ -7,9 +7,10 @@ overrides:
       journal_collocation: true
       journal_size: 1024
       osd_auto_discovery: false
+      osd_scenario: collocated
       calamari: true
       ceph_conf_overrides:
-          global: 
+          global:
             osd default pool size: 2
             osd pool default pg num:  128
             osd pool default pgp num:  128
diff --git a/qa/suites/smoke/ceph-ansible/clusters/3-mon-2-osds.yaml b/qa/suites/smoke/ceph-ansible/clusters/3-mon-2-osds.yaml
index 3c10bb8607692..e6733d9486fc1 100644
--- a/qa/suites/smoke/ceph-ansible/clusters/3-mon-2-osds.yaml
+++ b/qa/suites/smoke/ceph-ansible/clusters/3-mon-2-osds.yaml
@@ -3,6 +3,7 @@ meta:
 overrides:
  ceph_ansible:
    vars:
+      osd_scenario: collocated
       ceph_conf_overrides:
         global:
           osd_default_pool_size: 2
diff --git a/qa/suites/smoke/ceph-ansible/clusters/3-mon-3-osds.yaml b/qa/suites/smoke/ceph-ansible/clusters/3-mon-3-osds.yaml
index 827cbe7e1f4fc..5d31fe4666403 100644
--- a/qa/suites/smoke/ceph-ansible/clusters/3-mon-3-osds.yaml
+++ b/qa/suites/smoke/ceph-ansible/clusters/3-mon-3-osds.yaml
@@ -3,9 +3,10 @@ meta:
 overrides:
  ceph_ansible:
    vars:
+      osd_scenario: collocated
       ceph_conf_overrides:
         global:
-          osd_default_pool_size: 3 
+          osd_default_pool_size: 3
           osd_pool_default_pg_num: 128
           osd_pool_default_pgp_num: 128
 roles:
diff --git a/qa/suites/smoke/ceph-ansible/clusters/4-mon-1-mds-3-osds.yaml b/qa/suites/smoke/ceph-ansible/clusters/4-mon-1-mds-3-osds.yaml
index 9668677ba1588..38bcda836a95e 100644
--- a/qa/suites/smoke/ceph-ansible/clusters/4-mon-1-mds-3-osds.yaml
+++ b/qa/suites/smoke/ceph-ansible/clusters/4-mon-1-mds-3-osds.yaml
@@ -3,6 +3,7 @@ meta:
 overrides:
  ceph_ansible:
    vars:
+      osd_scenario: collocated
       ceph_conf_overrides:
         global:
           osd_default_pool_size: 2
diff --git a/qa/suites/smoke/s3a-hadoop/s3a-hadoop-v2.yaml b/qa/suites/smoke/s3a-hadoop/s3a-hadoop-v2.yaml
index be94356993111..f5ee14b7d629d 100644
--- a/qa/suites/smoke/s3a-hadoop/s3a-hadoop-v2.yaml
+++ b/qa/suites/smoke/s3a-hadoop/s3a-hadoop-v2.yaml
@@ -7,10 +7,11 @@ overrides:
             osd default pool size: 2
             osd pool default pg num: 128
             osd pool default pgp num: 128
-            debug rgw: 20 
+            debug rgw: 20
             debug ms: 1
         ceph_test: true
         journal_collocation: true
+        osd_scenario: collocated
         journal_size: 1024
 roles:
 - [mon.a, osd.0, osd.1, osd.2, rgw.0]
diff --git a/qa/suites/smoke/s3a-hadoop/s3a-hadoop.yaml b/qa/suites/smoke/s3a-hadoop/s3a-hadoop.yaml
index 3a800d41dce67..32f2dad535472 100644
--- a/qa/suites/smoke/s3a-hadoop/s3a-hadoop.yaml
+++ b/qa/suites/smoke/s3a-hadoop/s3a-hadoop.yaml
@@ -7,10 +7,11 @@ overrides:
             osd default pool size: 2
             osd pool default pg num: 128
             osd pool default pgp num: 128
-            debug rgw: 20 
+            debug rgw: 20
             debug ms: 1
         ceph_test: true
         journal_collocation: true
+        osd_scenario: collocated
         journal_size: 1024
 roles:
 - [mon.a, osd.0, osd.1, osd.2, rgw.0]