Merge pull request #21146 from zmc/wip-cephmetrics

qa/suites/cephmetrics: Updates for new version
ceph · Apr 4, 2018 · 806072a · 806072a
2 parents 953744e + dd5e15a
commit 806072a
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 1 deletion.
diff --git a/qa/suites/cephmetrics/2-ceph/ceph_ansible.yaml b/qa/suites/cephmetrics/2-ceph/ceph_ansible.yaml
@@ -3,19 +3,29 @@ meta:
 
 overrides:
    ceph_ansible:
-     branch: stable-3.0
      vars:
         ceph_conf_overrides:
           global:
             osd default pool size: 2
             mon pg warn min per osd: 2
+            osd pool default pg num: 64
+            osd pool default pgp num: 64
+            mon_max_pg_per_osd: 1024
         ceph_test: true
         ceph_stable_release: luminous
         osd_scenario: collocated
         journal_size: 1024
         osd_auto_discovery: false
         ceph_origin: repository
         ceph_repository: dev
+        ceph_mgr_modules:
+          - status
+          - restful
+        cephfs_pools:
+          - name: "cephfs_data"
+            pgs: "64"
+          - name: "cephfs_metadata"
+            pgs: "64"
 tasks:
 - ssh-keys:
 - ceph_ansible:

diff --git a/...rics/3-config/bluestore_with_dmcrypt.yaml → ...3-ceph-config/bluestore_with_dmcrypt.yaml b/...rics/3-config/bluestore_with_dmcrypt.yaml → ...3-ceph-config/bluestore_with_dmcrypt.yaml
diff --git a/...s/3-config/bluestore_without_dmcrypt.yaml → ...eph-config/bluestore_without_dmcrypt.yaml b/...s/3-config/bluestore_without_dmcrypt.yaml → ...eph-config/bluestore_without_dmcrypt.yaml
diff --git a/...tes/cephmetrics/3-config/dmcrypt_off.yaml → ...ephmetrics/3-ceph-config/dmcrypt_off.yaml b/...tes/cephmetrics/3-config/dmcrypt_off.yaml → ...ephmetrics/3-ceph-config/dmcrypt_off.yaml
diff --git a/...ites/cephmetrics/3-config/dmcrypt_on.yaml → ...cephmetrics/3-ceph-config/dmcrypt_on.yaml b/...ites/cephmetrics/3-config/dmcrypt_on.yaml → ...cephmetrics/3-ceph-config/dmcrypt_on.yaml
diff --git a/qa/suites/cephmetrics/4-epel/no_epel.yaml b/qa/suites/cephmetrics/4-epel/no_epel.yaml
@@ -0,0 +1,7 @@
+meta:
+  - desc: "Without EPEL"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        use_epel: false
diff --git a/qa/suites/cephmetrics/4-epel/use_epel.yaml b/qa/suites/cephmetrics/4-epel/use_epel.yaml
@@ -0,0 +1,7 @@
+meta:
+  - desc: "Using EPEL"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        use_epel: true
diff --git a/qa/suites/cephmetrics/5-containers/containerized.yaml b/qa/suites/cephmetrics/5-containers/containerized.yaml
@@ -0,0 +1,10 @@
+meta:
+  - desc: "Containerized prometheus and grafana"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        prometheus:
+          containerized: true
+        grafana:
+          containerized: true
diff --git a/qa/suites/cephmetrics/5-containers/no_containers.yaml b/qa/suites/cephmetrics/5-containers/no_containers.yaml
@@ -0,0 +1,10 @@
+meta:
+  - desc: "Packaged prometheus and grafana"
+overrides:
+  cephmetrics:
+    group_vars:
+      all:
+        prometheus:
+          containerized: false
+        grafana:
+          containerized: false
diff --git a/...ites/cephmetrics/4-tasks/cephmetrics.yaml → ...ites/cephmetrics/6-tasks/cephmetrics.yaml b/...ites/cephmetrics/4-tasks/cephmetrics.yaml → ...ites/cephmetrics/6-tasks/cephmetrics.yaml