qa/suites/rgw: Add openstack volume configuration

Without this, OSDs will fail to create on instances whose root fs isn't
xfs.

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

diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml
index 9a93c9cbd09d3dafe55570ce990af53ae137b463..861e50919315650b73ab6c7d0f07007a20a28a04 100644 (file)
--- a/qa/clusters/fixed-2.yaml
+++ b/qa/clusters/fixed-2.yaml
@@ -1,3 +1,7 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
 - [mon.b, osd.3, osd.4, osd.5, client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml b/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
index 328641ea0a124f042aa86e2a45461ec47c9b12da..3100691ca29955b8a4d73ad6c89eecf2332eca1e 100644 (file)
--- a/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml
@@ -1,5 +1,9 @@
 roles:
 - [mon.a, osd.0, osd.1, osd.2, osd.3, client.0, client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml b/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
index 8e1c7194e01c448ff0e215aea03c58142555f7bd..93b75517898555a25d1069ddb73f5da8c7e63c5f 100644 (file)
--- a/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
@@ -1,6 +1,10 @@
 roles:
 - [mon.a, osd.0, osd.1, osd.2, client.0]
 - [mon.b, mon.c, osd.3, osd.4, osd.5, client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
 tasks:
 - install: 
 - ceph:

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin.yaml b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
index fd2a131fdbbd3a50b1f69d727f770d64d9910024..e63d3ec73ad3197cc4b736e03c7406662f88c6cb 100644 (file)
--- a/qa/suites/rgw/singleton/all/radosgw-admin.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
@@ -1,5 +1,10 @@
 roles:
 - [mon.a, osd.0, client.0, osd.1, osd.2, osd.3]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
+>>>>>>> 8af4c35f95... qa/suites/rgw: Add openstack volume configuration
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml b/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
index 6035e421baa8d68d204a2b9205951021d72fc852..5da11351a20783185c997ae467a1b44fc4878f21 100644 (file)
--- a/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
@@ -17,6 +17,10 @@ overrides:
 roles:
 - [mon.a, osd.0, osd.1, osd.2, client.0]
 - [mon.b, mon.c, osd.3, osd.4, osd.5, client.1]
+openstack:
+- volumes: # attached to each instance
+    count: 3
+    size: 10 # GB
 
 tasks:
 - install: