From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 24 Mar 2016 09:23:30 +0000 (+0100)
Subject: upgrade/infernalis-x: allocate OpenStack volumes for each OSD
X-Git-Tag: v10.2.6~165^2^2~126^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc0b1812991c7a69c0a20e0461b2b3c112c3ac5d;p=ceph.git

upgrade/infernalis-x: allocate OpenStack volumes for each OSD

The intention is to run with xfs which requires a separate disk for each
OSD. In addition the tests will exhaust the available root disk space
otherwise.

http://tracker.ceph.com/issues/15236 Fixes: #15236

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/suites/upgrade/infernalis-x/parallel/0-cluster/+ b/suites/upgrade/infernalis-x/parallel/0-cluster/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/infernalis-x/parallel/0-cluster/openstack.yaml b/suites/upgrade/infernalis-x/parallel/0-cluster/openstack.yaml
new file mode 100644
index 000000000000..f4d1349b4826
--- /dev/null
+++ b/suites/upgrade/infernalis-x/parallel/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB
diff --git a/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml b/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
index dd6514a77422..cc49096b4c11 100644
--- a/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
+++ b/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
@@ -36,6 +36,10 @@ roles:
   - osd.5
   - client.0
 - - client.1
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 30 # GB
 tasks:
 - print: "****  v9.2.0 about to install"
 - install:
diff --git a/suites/upgrade/infernalis-x/stress-split/0-cluster/+ b/suites/upgrade/infernalis-x/stress-split/0-cluster/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/infernalis-x/stress-split/0-cluster/openstack.yaml b/suites/upgrade/infernalis-x/stress-split/0-cluster/openstack.yaml
new file mode 100644
index 000000000000..a0d5c20195be
--- /dev/null
+++ b/suites/upgrade/infernalis-x/stress-split/0-cluster/openstack.yaml
@@ -0,0 +1,6 @@
+openstack:
+  - machine:
+      disk: 100 # GB
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB