From: Zack Cerza <zack@redhat.com>
Date: Fri, 24 Feb 2017 22:25:19 +0000 (-0700)
Subject: qa/suites/fs: Add openstack volume configuration
X-Git-Tag: v10.2.6~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13642%2Fhead;p=ceph.git

qa/suites/fs: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit b076d89a3f1fbad7d477913812b2e17529abeacf)
---

diff --git a/qa/clusters/fixed-2-ucephfs.yaml b/qa/clusters/fixed-2-ucephfs.yaml
index ab74a23d0909..bc120ad0b29f 100644
--- a/qa/clusters/fixed-2-ucephfs.yaml
+++ b/qa/clusters/fixed-2-ucephfs.yaml
@@ -1,6 +1,10 @@
 roles:
 - [mon.a, mds.a, osd.0, osd.1, client.0]
 - [mon.b, mds.a-s, mon.c, osd.2, osd.3]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/multiclient/clusters/three_clients.yaml b/qa/suites/fs/multiclient/clusters/three_clients.yaml
index bf87f26f7fa7..1fc1b4454404 100644
--- a/qa/suites/fs/multiclient/clusters/three_clients.yaml
+++ b/qa/suites/fs/multiclient/clusters/three_clients.yaml
@@ -4,6 +4,11 @@ roles:
 - [client.1]
 - [client.0]
 
+openstack:
+- volumes: # attached to each instance
+    count: 1
+    size: 10 # GB
+
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/multiclient/clusters/two_clients.yaml b/qa/suites/fs/multiclient/clusters/two_clients.yaml
index 2bcf4dc73911..e6d82601cfdc 100644
--- a/qa/suites/fs/multiclient/clusters/two_clients.yaml
+++ b/qa/suites/fs/multiclient/clusters/two_clients.yaml
@@ -3,6 +3,11 @@ roles:
 - [client.1]
 - [client.0]
 
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
+
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
index 1595fe436040..b5ff712cb472 100644
--- a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
+++ b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
@@ -1,6 +1,10 @@
 roles:
 - [mon.a, osd.0, mon.b, mds.a, mds.b, client.1]
 - [mds.c, mds.d, mon.c, client.0, osd.1, osd.2]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
index 702bb161e75b..6b5e23b6c1f7 100644
--- a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
+++ b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
@@ -1,6 +1,10 @@
 roles:
 - [mon.a, osd.0, mds.a, mds.b, client.1, client.2, client.3]
 - [client.0, osd.1, osd.2]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
index 011503946ad3..ba2442b27ca7 100644
--- a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
+++ b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
@@ -8,6 +8,10 @@ overrides:
 roles:
 - [mon.a, mds.a, mds.b-s-0, osd.0, osd.1, client.0]
 - [mon.b, mds.c-s-0, mds.d-s-0, mon.c, osd.2, osd.3]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G
diff --git a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
index e981076d7278..cceea69e2636 100644
--- a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
+++ b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
@@ -1,6 +1,10 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, mds.b-s-a]
 - [mon.b, mds.a, osd.3, osd.4, osd.5, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
 log-rotate:
   ceph-mds: 10G
   ceph-osd: 10G