use ceph-ansible and auto_discovery options to use all devs

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

diff --git a/qa/suites/perf-basic/ceph.yaml b/qa/suites/perf-basic/ceph.yaml
index 6738a53fa231bf0c2c1c6684eb5b395a963df498..942967df4c27194ad65801ae50bcf819075594f8 100644 (file)
--- a/qa/suites/perf-basic/ceph.yaml
+++ b/qa/suites/perf-basic/ceph.yaml
@@ -4,27 +4,20 @@ meta:
    Must be run on bare-metal machines.
    On VMs performance results will be inconsistent
    and can't be compared across runs.
-   Run ceph on a single node.
+   Run ceph on a multi node using ceph-ansible.
    Use xfs beneath the osds.
    Setup rgw on client.0
 
 roles:
-- [mon.a, mgr.x]
-- [mon.b, mgr.y]
-- [mon.c, mgr.z]
+- [mon.a, mgr.x, osd.9, osd.10, osd.11]
+- [mon.b, mgr.y, osd.12, osd.13, osd.14]
+- [mon.c, mgr.z, osd.15, osd.16, osd.17, rgw.0]
 - [osd.0, osd.1, osd.2]
 - [osd.3, osd.4, osd.5]
 - [osd.6, osd.7, osd.8]
+- [osd.18, osd.19, osd.20]
 - [client.0]
 tasks:
 - install:
-- ceph:
-    fs: xfs
-    wait-for-scrub: false
-    log-whitelist:
-      - \(PG_
-      - \(OSD_
-      - \(OBJECT_
-      - overall HEALTH
-- rgw: [client.0]
 - ssh_keys:
+- ceph-ansible:

diff --git a/qa/suites/perf-basic/objectstore/bluestore.yaml b/qa/suites/perf-basic/objectstore/bluestore.yaml
index f5793d76ee5d2bf4d7e1c1737c30e8eda95a20ee..309df53356122fa0d7809a5a54ae87fa97de4281 100644 (file)
--- a/qa/suites/perf-basic/objectstore/bluestore.yaml
+++ b/qa/suites/perf-basic/objectstore/bluestore.yaml
@@ -1,4 +1,28 @@
 overrides:
+  ceph_ansible:
+    vars:
+      ceph_stable: true
+      ceph_origin: distro
+      ceph_stable_rh_storage: true
+      copy_admin_key: true
+      ceph_repository: rhcs
+      ceph_stable_release: luminous
+      osd_scenario: collocated
+      osd_auto_discovery: true
+      ceph_test: true
+      ceph_conf_overrides:
+        global:
+          osd objectstore: bluestore
+          bluestore block size: 96636764160
+      ceph_mgr_modules:
+         - status
+         - restful
+      cephfs_pools:
+        - name: "cephfs_data"
+          pgs: "64"
+        - name: "cephfs_metadata"
+          pgs: "64"
+
   ceph:
     fs: xfs
     conf:
@@ -12,4 +36,3 @@ overrides:
       osd:
         osd objectstore: bluestore
         bluestore block size: 96636764160
-

diff --git a/qa/suites/perf-basic/objectstore/filestore-xfs.yaml b/qa/suites/perf-basic/objectstore/filestore-xfs.yaml
index f7aa0dd79c6ae529d3bfdec8fedba2e227a90cd9..c54738ac6547fd95659ed01638ef4d5628a39cde 100644 (file)
--- a/qa/suites/perf-basic/objectstore/filestore-xfs.yaml
+++ b/qa/suites/perf-basic/objectstore/filestore-xfs.yaml
@@ -1,4 +1,27 @@
 overrides:
+  ceph_ansible:
+    vars:
+      ceph_stable: true
+      ceph_origin: distro
+      ceph_stable_rh_storage: true
+      ceph_repository: rhcs
+      copy_admin_key: true
+      ceph_stable_release: luminous
+      osd_scenario: collocated
+      osd_auto_discovery: true
+      ceph_test: true
+      ceph_conf_overrides:
+        global:
+           osd objectstore: filestore
+           osd sloppy crc: true
+      ceph_mgr_modules:
+         - status
+         - restful
+      cephfs_pools:
+        - name: "cephfs_data"
+          pgs: "64"
+        - name: "cephfs_metadata"
+          pgs: "64"
   ceph:
     fs: xfs
     conf:
@@ -12,4 +35,3 @@ overrides:
       osd:
         osd objectstore: filestore
         osd sloppy crc: true
-

diff --git a/qa/suites/perf-basic/settings/optimized.yaml b/qa/suites/perf-basic/settings/optimized.yaml
index fffb9be5e6c8a766dcb1fb8e4923d6f4380bf149..e8bfdcb05019e34003c2e9f7c60bfb2ac432f2e1 100644 (file)
--- a/qa/suites/perf-basic/settings/optimized.yaml
+++ b/qa/suites/perf-basic/settings/optimized.yaml
@@ -3,8 +3,9 @@ meta:
    Use debug level 0/0 for performance tests.
 
 overrides:
-  ceph:
-    conf:
+  ceph-ansible:
+   vars:
+    ceph_conf_overrides:
       mon:
         debug mon: "0/0"
         debug ms: "0/0"