From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Aug 2017 18:28:56 +0000 (-0400)
Subject: qa/clusters/fixed-[23]: 4 osds per node, not 3
X-Git-Tag: v12.1.3~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfcb344739e11912e60aa1fb559aa123b3cf81f1;p=ceph.git

qa/clusters/fixed-[23]: 4 osds per node, not 3

Smithi have 4 nvme partitions available for use.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 387ad56a6915ab6740fb6fb18037b31d757018c7)
---

diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml
index f3ef241956807..5d5fcca9c950f 100644
--- a/qa/clusters/fixed-2.yaml
+++ b/qa/clusters/fixed-2.yaml
@@ -3,10 +3,10 @@ roles:
 - [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1]
 openstack:
 - volumes: # attached to each instance
-    count: 3
+    count: 4
     size: 10 # GB
 overrides:
   ceph:
     conf:
       osd:
-        osd shutdown pgref assert: true
\ No newline at end of file
+        osd shutdown pgref assert: true
diff --git a/qa/clusters/fixed-3.yaml b/qa/clusters/fixed-3.yaml
index cd4f4e8ec2ec9..ddc79a84b60c6 100644
--- a/qa/clusters/fixed-3.yaml
+++ b/qa/clusters/fixed-3.yaml
@@ -1,13 +1,13 @@
 roles:
-- [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2]
-- [mon.b, mgr.y, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, mgr.y, osd.4, osd.5, osd.6, osd.7]
 - [client.0]
 openstack:
 - volumes: # attached to each instance
-    count: 3
+    count: 4
     size: 10 # GB
 overrides:
   ceph:
     conf:
       osd:
-        osd shutdown pgref assert: true
\ No newline at end of file
+        osd shutdown pgref assert: true
diff --git a/qa/suites/rbd/librbd/clusters/openstack.yaml b/qa/suites/rbd/librbd/clusters/openstack.yaml
index f4d1349b48262..b0f3b9b4da228 100644
--- a/qa/suites/rbd/librbd/clusters/openstack.yaml
+++ b/qa/suites/rbd/librbd/clusters/openstack.yaml
@@ -1,4 +1,4 @@
 openstack:
   - volumes: # attached to each instance
-      count: 3
+      count: 4
       size: 30 # GB
diff --git a/qa/suites/rbd/qemu/clusters/openstack.yaml b/qa/suites/rbd/qemu/clusters/openstack.yaml
index f87995808a15b..9c39c7e5fb681 100644
--- a/qa/suites/rbd/qemu/clusters/openstack.yaml
+++ b/qa/suites/rbd/qemu/clusters/openstack.yaml
@@ -4,5 +4,5 @@ openstack:
       ram: 30000 # MB
       cpus: 1
     volumes: # attached to each instance
-      count: 3
+      count: 4
       size: 30 # GB
diff --git a/qa/suites/smoke/basic/clusters/openstack.yaml b/qa/suites/smoke/basic/clusters/openstack.yaml
index 4d6edcd07b614..7d652b491c93d 100644
--- a/qa/suites/smoke/basic/clusters/openstack.yaml
+++ b/qa/suites/smoke/basic/clusters/openstack.yaml
@@ -4,5 +4,5 @@ openstack:
       ram: 8000 # MB
       cpus: 1
     volumes: # attached to each instance
-      count: 3
+      count: 4
       size: 10 # GB