From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Jul 2018 15:58:29 +0000 (-0500)
Subject: qa/suites/krbd: use 8 osds instead of 6
X-Git-Tag: v10.2.11~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f06bc9ee9428f317ade513f101ee72a08ef52d0f;p=ceph.git

qa/suites/krbd: use 8 osds instead of 6

This is done in master.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/krbd/rbd-nomount/clusters/fixed-3-more.yaml b/qa/suites/krbd/rbd-nomount/clusters/fixed-3-more.yaml
new file mode 100644
index 000000000000..ec2fa0c2c68f
--- /dev/null
+++ b/qa/suites/krbd/rbd-nomount/clusters/fixed-3-more.yaml
@@ -0,0 +1,13 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/krbd/rbd-nomount/clusters/fixed-3.yaml b/qa/suites/krbd/rbd-nomount/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec2..000000000000
--- a/qa/suites/krbd/rbd-nomount/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file
diff --git a/qa/suites/krbd/rbd/clusters/fixed-3-more.yaml b/qa/suites/krbd/rbd/clusters/fixed-3-more.yaml
new file mode 100644
index 000000000000..ec2fa0c2c68f
--- /dev/null
+++ b/qa/suites/krbd/rbd/clusters/fixed-3-more.yaml
@@ -0,0 +1,13 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/krbd/rbd/clusters/fixed-3.yaml b/qa/suites/krbd/rbd/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec2..000000000000
--- a/qa/suites/krbd/rbd/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file
diff --git a/qa/suites/krbd/thrash/clusters/fixed-3-more.yaml b/qa/suites/krbd/thrash/clusters/fixed-3-more.yaml
new file mode 100644
index 000000000000..ec2fa0c2c68f
--- /dev/null
+++ b/qa/suites/krbd/thrash/clusters/fixed-3-more.yaml
@@ -0,0 +1,13 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2, osd.3]
+- [mon.b, osd.4, osd.5, osd.6, osd.7]
+- [client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/krbd/thrash/clusters/fixed-3.yaml b/qa/suites/krbd/thrash/clusters/fixed-3.yaml
deleted file mode 120000
index a3ac9fc4dec2..000000000000
--- a/qa/suites/krbd/thrash/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-3.yaml
\ No newline at end of file