From 4c55a78a52f9e089b97ab8a2feb9876ebdba0516 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 23 Feb 2017 10:14:05 -0700 Subject: [PATCH] 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 --- qa/clusters/fixed-2.yaml | 4 ++++ qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml | 4 ++++ qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml | 4 ++++ qa/suites/rgw/singleton/all/radosgw-admin.yaml | 4 ++++ qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml index 9a93c9cbd09d3..861e509193156 100644 --- 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 0427879765fbd..4885bf7820332 100644 --- a/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml +++ b/qa/suites/rgw/singleton/all/radosgw-admin-data-sync.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, osd.0, client.0] - [osd.1, osd.2, osd.3, 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-multi-region.yaml b/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml index 8e1c7194e01c4..93b7551789855 100644 --- 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 e89ee3c8da10f..ccdafad206935 100644 --- a/qa/suites/rgw/singleton/all/radosgw-admin.yaml +++ b/qa/suites/rgw/singleton/all/radosgw-admin.yaml @@ -1,6 +1,10 @@ roles: - [mon.a, osd.0] - [client.0, osd.1, osd.2, osd.3] +openstack: +- volumes: # attached to each instance + count: 3 + size: 10 # GB 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 6035e421baa8d..5da11351a2078 100644 --- 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: -- 2.39.5