Merge PR #19885 into master

* refs/pull/19885/head:
	qa: increase osd count for ec testing
	qa: add missing openstack configs

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-01-12 14:37:25 -08:00
commit e592c0210f
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
3 changed files with 11 additions and 3 deletions

View File

@ -2,3 +2,7 @@ roles:
- [mon.a, mon.c, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3]
- [mon.b, mgr.x, mds.b, mds.c, osd.4, osd.5, osd.6, osd.7]
- [client.0]
openstack:
- volumes: # attached to each instance
count: 4
size: 10 # GB

View File

@ -2,3 +2,7 @@ roles:
- [mon.a, mon.c, mgr.y, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2, osd.3]
- [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.4, osd.5, osd.6, osd.7]
- [client.0]
openstack:
- volumes: # attached to each instance
count: 4
size: 10 # GB

View File

@ -1,9 +1,9 @@
roles:
- [mon.a, mds.a, mgr.x, osd.0, osd.1, client.0]
- [mon.b, mds.a-s, mon.c, mgr.y, osd.2, osd.3]
- [mon.a, mgr.y, mds.a, osd.0, osd.1, osd.2, osd.3, client.0]
- [mon.b, mon.c, mgr.x, mds.a-s, osd.4, osd.5, osd.6, osd.7]
openstack:
- volumes: # attached to each instance
count: 2
count: 4
size: 10 # GB
log-rotate:
ceph-mds: 10G