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 ab74a23d09095eb8bab213242857413c583076ff..bc120ad0b29fb5fcab02415476fb0c84b8cb6dc1 100644 (file)
--- 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 bf87f26f7fa709a7b96eff56658eef72d0975984..1fc1b4454404e5dff1a49d25b56f5a5c55d1d699 100644 (file)
--- 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 2bcf4dc739113aa4271443c9912a65f5f15c03db..e6d82601cfdc1863637cb8b9e8a065ca8c785dfd 100644 (file)
--- 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 1595fe4360409a4ad506d8ea0dc3aa2d20873ba8..b5ff712cb4723bebc04bdd1d7651ee7ef6f9f369 100644 (file)
--- 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 702bb161e75b5b022278b1e9a6ce1ff05748e6d1..6b5e23b6c1f7c12359cba5367f8daadac4ed38dd 100644 (file)
--- 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 011503946ad373e1aff2d4ab769496fbca0f4287..ba2442b27ca70ff59074f86f621d842aad7ec55e 100644 (file)
--- 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 e981076d72784e5a73c85e6b3fb07dbb98797790..cceea69e2636b8650bb8dcde88b485f697ddc2c6 100644 (file)
--- 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