From: shylesh kumar <shylesh.mohan@gmail.com>
Date: Thu, 6 Dec 2018 04:39:37 +0000 (-0500)
Subject: Make filestore as objstore in smoke/ceph-ansible/migration suites
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6078a799608b60cb6219d853e7ca16e11d13c071;p=ceph.git

Make filestore as objstore in smoke/ceph-ansible/migration suites

Signed-off-by: shylesh kumar <shylesh.mohan@gmail.com>
---

diff --git a/qa/suites/smoke/ceph-ansible/tasks/migrate_store.yaml b/qa/suites/smoke/ceph-ansible/tasks/migrate_store.yaml
deleted file mode 100644
index 9303c4883aa48..0000000000000
--- a/qa/suites/smoke/ceph-ansible/tasks/migrate_store.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms inject delay max: 1
-        ms inject delay probability: 0.005
-        ms inject delay type: osd
-        ms inject internal delays: 0.002
-        ms inject socket failures: 2500
-tasks:
-- ssh-keys:
-- ceph_ansible:
-    rhbuild: '3.1'
-    vars:
-      ceph_conf_overrides:
-        global:
-          mon_max_pg_per_osd: 1024
-          osd default pool size: 2
-          osd pool default pg num: 64
-          osd pool default pgp num: 64
-      ceph_origin: distro
-      ceph_repository: rhcs
-      ceph_stable: true
-      ceph_stable_release: luminous
-      ceph_stable_rh_storage: true
-      ceph_test: true
-      journal_size: 1024
-      osd_auto_discovery: true
-      osd_scenario: collocated
-- migrate_store:
diff --git a/qa/suites/smoke/migration/tasks/migrate_store.yaml b/qa/suites/smoke/migration/tasks/migrate_store.yaml
index 0ba83985bc39f..0d6595dd8fc5d 100644
--- a/qa/suites/smoke/migration/tasks/migrate_store.yaml
+++ b/qa/suites/smoke/migration/tasks/migrate_store.yaml
@@ -1,7 +1,6 @@
 tasks:
 - ssh-keys:
 - ceph_ansible:
-    rhbuild: '3.1'
     vars:
       ceph_conf_overrides:
         global:
diff --git a/qa/tasks/migrate_store.py b/qa/tasks/migrate_store.py
index df946f10ea7ee..18acef93205eb 100644
--- a/qa/tasks/migrate_store.py
+++ b/qa/tasks/migrate_store.py
@@ -383,7 +383,8 @@ def check_all_filestore(mon, num_osds):
     LOG.info(out)
 
     dout = json.loads(out)
-    fcount = dout['filestore']
+    if 'filestore' in dout:
+        fcount = dout['filestore']
 
     if fcount != num_osds:
         LOG.warning("Looks like not all osds are on filestore \