From 344d5974fdacd89ad04bf5cf86a13306c20a9350 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 22 Jul 2014 16:44:02 +0100 Subject: [PATCH] Remove mds role from rados & rgw tests Follow up to a24efaef, remove the mds from the (mainly singleton) test configs that explicitly list it. Signed-off-by: John Spray --- suites/rados/monthrash/clusters/3-mons.yaml | 2 +- suites/rados/monthrash/clusters/9-mons.yaml | 2 +- suites/rados/multimon/clusters/21.yaml | 2 +- suites/rados/multimon/clusters/3.yaml | 2 +- suites/rados/multimon/clusters/6.yaml | 2 +- suites/rados/multimon/clusters/9.yaml | 2 +- suites/rados/singleton-nomsgr/all/alloc-hint.yaml | 2 +- suites/rados/singleton-nomsgr/all/ceph-post-file.yaml | 2 +- suites/rados/singleton-nomsgr/all/filejournal.yaml | 2 +- .../singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml | 2 +- suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml | 2 +- suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml | 3 +-- suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml | 2 +- suites/rados/singleton-nomsgr/all/objectstore.yaml | 2 +- suites/rados/singleton/all/admin-socket.yaml | 1 - suites/rados/singleton/all/cephtool.yaml | 1 - suites/rados/singleton/all/dump-stuck.yaml | 1 - suites/rados/singleton/all/ec-lost-unfound.yaml | 1 - suites/rados/singleton/all/lost-unfound-delete.yaml | 1 - suites/rados/singleton/all/lost-unfound.yaml | 1 - suites/rados/singleton/all/mon-config-keys.yaml | 1 - suites/rados/singleton/all/mon-thrasher.yaml | 1 - suites/rados/singleton/all/osd-backfill.yaml | 1 - suites/rados/singleton/all/osd-recovery-incomplete.yaml | 1 - suites/rados/singleton/all/osd-recovery.yaml | 1 - suites/rados/singleton/all/peer.yaml | 1 - suites/rados/singleton/all/rest-api.yaml | 1 - suites/rados/singleton/all/thrash-rados.yaml | 1 - .../singleton/all/thrash_cache_writeback_forward_none.yaml | 1 - suites/rgw/singleton/all/radosgw-admin-multi-region.yaml | 2 +- suites/rgw/singleton/all/radosgw-admin.yaml | 2 +- suites/rgw/singleton/all/radosgw-convert-to-region.yaml | 2 +- 32 files changed, 17 insertions(+), 33 deletions(-) diff --git a/suites/rados/monthrash/clusters/3-mons.yaml b/suites/rados/monthrash/clusters/3-mons.yaml index 6298ff23c553c..b36db6592bd3d 100644 --- a/suites/rados/monthrash/clusters/3-mons.yaml +++ b/suites/rados/monthrash/clusters/3-mons.yaml @@ -1,3 +1,3 @@ roles: - [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mds.a, osd.3, osd.4, osd.5, client.0] +- [mon.b, osd.3, osd.4, osd.5, client.0] diff --git a/suites/rados/monthrash/clusters/9-mons.yaml b/suites/rados/monthrash/clusters/9-mons.yaml index a22e6c5a0fc64..fdb87c6b324ae 100644 --- a/suites/rados/monthrash/clusters/9-mons.yaml +++ b/suites/rados/monthrash/clusters/9-mons.yaml @@ -1,3 +1,3 @@ roles: - [mon.a, mon.b, mon.c, mon.d, mon.e, osd.0, osd.1, osd.2] -- [mon.f, mon.g, mon.h, mon.i, mds.a, osd.3, osd.4, osd.5, client.0] +- [mon.f, mon.g, mon.h, mon.i, osd.3, osd.4, osd.5, client.0] diff --git a/suites/rados/multimon/clusters/21.yaml b/suites/rados/multimon/clusters/21.yaml index 2d134788a6f07..b1ab62cc567f2 100644 --- a/suites/rados/multimon/clusters/21.yaml +++ b/suites/rados/multimon/clusters/21.yaml @@ -1,4 +1,4 @@ roles: - [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0] -- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mds.a] +- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t] - [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1] diff --git a/suites/rados/multimon/clusters/3.yaml b/suites/rados/multimon/clusters/3.yaml index 703cc664f876b..309809648da84 100644 --- a/suites/rados/multimon/clusters/3.yaml +++ b/suites/rados/multimon/clusters/3.yaml @@ -1,2 +1,2 @@ roles: -- [mon.a, mon.b, mon.c, osd.0, osd.1, mds.a] +- [mon.a, mon.b, mon.c, osd.0, osd.1] diff --git a/suites/rados/multimon/clusters/6.yaml b/suites/rados/multimon/clusters/6.yaml index 6278066036190..6211cead9afab 100644 --- a/suites/rados/multimon/clusters/6.yaml +++ b/suites/rados/multimon/clusters/6.yaml @@ -1,3 +1,3 @@ roles: - [mon.a, mon.c, mon.e, osd.0] -- [mon.b, mon.d, mon.f, osd.1, mds.a] +- [mon.b, mon.d, mon.f, osd.1] diff --git a/suites/rados/multimon/clusters/9.yaml b/suites/rados/multimon/clusters/9.yaml index b87a158dbb0a5..3d2cf53f5c510 100644 --- a/suites/rados/multimon/clusters/9.yaml +++ b/suites/rados/multimon/clusters/9.yaml @@ -1,4 +1,4 @@ roles: - [mon.a, mon.d, mon.g, osd.0] -- [mon.b, mon.e, mon.h, mds.a] +- [mon.b, mon.e, mon.h] - [mon.c, mon.f, mon.i, osd.1] diff --git a/suites/rados/singleton-nomsgr/all/alloc-hint.yaml b/suites/rados/singleton-nomsgr/all/alloc-hint.yaml index dca38c67bb55d..8315aba6a5d59 100644 --- a/suites/rados/singleton-nomsgr/all/alloc-hint.yaml +++ b/suites/rados/singleton-nomsgr/all/alloc-hint.yaml @@ -1,5 +1,5 @@ roles: -- [mon.a, mds.a, osd.0, osd.1, osd.2, client.0] +- [mon.a, osd.0, osd.1, osd.2, client.0] overrides: ceph: diff --git a/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml b/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml index b6a4ed27a5151..d0a4db067cf07 100644 --- a/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml +++ b/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml @@ -1,5 +1,5 @@ roles: -- [mon.a, mds.a, osd.0, osd.1, osd.2, client.0] +- [mon.a, osd.0, osd.1, osd.2, client.0] tasks: - install: - workunit: diff --git a/suites/rados/singleton-nomsgr/all/filejournal.yaml b/suites/rados/singleton-nomsgr/all/filejournal.yaml index 28a0c041d9eda..c647a61b74b4a 100644 --- a/suites/rados/singleton-nomsgr/all/filejournal.yaml +++ b/suites/rados/singleton-nomsgr/all/filejournal.yaml @@ -1,5 +1,5 @@ roles: -- [mon.0, osd.0, osd.1, mds.a, client.0] +- [mon.0, osd.0, osd.1, client.0] tasks: - install: - ceph: diff --git a/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml b/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml index 15437cf65c73d..17fe5158cac2c 100644 --- a/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml +++ b/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml @@ -1,5 +1,5 @@ roles: -- [mon.0, osd.0, osd.1, mds.a, client.0] +- [mon.0, osd.0, osd.1, client.0] tasks: - install: - ceph: diff --git a/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml b/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml index c6af200d57f0d..3d1894c6b6d56 100644 --- a/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml +++ b/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml @@ -1,5 +1,5 @@ roles: -- [mon.0, osd.0, osd.1, mds.a, client.0] +- [mon.0, osd.0, osd.1, client.0] tasks: - install: - ceph: diff --git a/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml b/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml index 2089c9f56ae1c..a9ec78a763a30 100644 --- a/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml +++ b/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml @@ -4,8 +4,7 @@ roles: - osd.1 - osd.2 - client.0 -- - mds.a - - osd.3 +- - osd.3 - osd.4 - osd.5 tasks: diff --git a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml b/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml index bc5a2838ef909..8b091c909249b 100644 --- a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml +++ b/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml @@ -1,5 +1,5 @@ roles: -- [mon.0, osd.0, osd.1, mds.a, client.0] +- [mon.0, osd.0, osd.1, client.0] tasks: - install: - ceph: diff --git a/suites/rados/singleton-nomsgr/all/objectstore.yaml b/suites/rados/singleton-nomsgr/all/objectstore.yaml index c31c1e188d396..a0ece14876ded 100644 --- a/suites/rados/singleton-nomsgr/all/objectstore.yaml +++ b/suites/rados/singleton-nomsgr/all/objectstore.yaml @@ -1,5 +1,5 @@ roles: -- [mon.0, osd.0, osd.1, mds.a, client.0] +- [mon.0, osd.0, osd.1, client.0] tasks: - install: - exec: diff --git a/suites/rados/singleton/all/admin-socket.yaml b/suites/rados/singleton/all/admin-socket.yaml index 9e580f29db6c0..0dbf9b219b290 100644 --- a/suites/rados/singleton/all/admin-socket.yaml +++ b/suites/rados/singleton/all/admin-socket.yaml @@ -1,7 +1,6 @@ roles: - - mon.a - osd.0 - - mds.a - osd.1 - client.a tasks: diff --git a/suites/rados/singleton/all/cephtool.yaml b/suites/rados/singleton/all/cephtool.yaml index 2ed5434960c74..114073baa4e77 100644 --- a/suites/rados/singleton/all/cephtool.yaml +++ b/suites/rados/singleton/all/cephtool.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/dump-stuck.yaml b/suites/rados/singleton/all/dump-stuck.yaml index 9bdcb0c3c7348..2752a38fd4596 100644 --- a/suites/rados/singleton/all/dump-stuck.yaml +++ b/suites/rados/singleton/all/dump-stuck.yaml @@ -1,6 +1,5 @@ roles: - - mon.a - - mds.0 - osd.0 - osd.1 tasks: diff --git a/suites/rados/singleton/all/ec-lost-unfound.yaml b/suites/rados/singleton/all/ec-lost-unfound.yaml index 1dd47518a8a96..7006d7f378312 100644 --- a/suites/rados/singleton/all/ec-lost-unfound.yaml +++ b/suites/rados/singleton/all/ec-lost-unfound.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/lost-unfound-delete.yaml b/suites/rados/singleton/all/lost-unfound-delete.yaml index 3df9e2ed601ae..e6e09d320d34c 100644 --- a/suites/rados/singleton/all/lost-unfound-delete.yaml +++ b/suites/rados/singleton/all/lost-unfound-delete.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/lost-unfound.yaml b/suites/rados/singleton/all/lost-unfound.yaml index 6014723ed08c9..0597e43713c16 100644 --- a/suites/rados/singleton/all/lost-unfound.yaml +++ b/suites/rados/singleton/all/lost-unfound.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/mon-config-keys.yaml b/suites/rados/singleton/all/mon-config-keys.yaml index 524c6b6f570a3..f81070fc770e2 100644 --- a/suites/rados/singleton/all/mon-config-keys.yaml +++ b/suites/rados/singleton/all/mon-config-keys.yaml @@ -2,7 +2,6 @@ roles: - - mon.0 - mon.1 - mon.2 - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/mon-thrasher.yaml b/suites/rados/singleton/all/mon-thrasher.yaml index 4e4e8571b356c..e69198c85e50c 100644 --- a/suites/rados/singleton/all/mon-thrasher.yaml +++ b/suites/rados/singleton/all/mon-thrasher.yaml @@ -4,7 +4,6 @@ roles: - mon.c - osd.0 - osd.1 - - mds.0 - client.0 tasks: - install: diff --git a/suites/rados/singleton/all/osd-backfill.yaml b/suites/rados/singleton/all/osd-backfill.yaml index 7c18a3b9bb0ab..781a63eaf6227 100644 --- a/suites/rados/singleton/all/osd-backfill.yaml +++ b/suites/rados/singleton/all/osd-backfill.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/suites/rados/singleton/all/osd-recovery-incomplete.yaml index e6f99983e02aa..123f4d44fbed0 100644 --- a/suites/rados/singleton/all/osd-recovery-incomplete.yaml +++ b/suites/rados/singleton/all/osd-recovery-incomplete.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/osd-recovery.yaml b/suites/rados/singleton/all/osd-recovery.yaml index 8307d42453347..a6e1d99f6fec4 100644 --- a/suites/rados/singleton/all/osd-recovery.yaml +++ b/suites/rados/singleton/all/osd-recovery.yaml @@ -2,7 +2,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/peer.yaml b/suites/rados/singleton/all/peer.yaml index a441059bbb8c9..655ea685584c0 100644 --- a/suites/rados/singleton/all/peer.yaml +++ b/suites/rados/singleton/all/peer.yaml @@ -2,7 +2,6 @@ roles: - - mon.0 - mon.1 - mon.2 - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/rest-api.yaml b/suites/rados/singleton/all/rest-api.yaml index 425db55660d76..d4855f7aef5f4 100644 --- a/suites/rados/singleton/all/rest-api.yaml +++ b/suites/rados/singleton/all/rest-api.yaml @@ -2,7 +2,6 @@ roles: - - mon.0 - mon.1 - mon.2 - - mds.a - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/thrash-rados.yaml b/suites/rados/singleton/all/thrash-rados.yaml index 4bdcf226546e9..82c47bf3fe7aa 100644 --- a/suites/rados/singleton/all/thrash-rados.yaml +++ b/suites/rados/singleton/all/thrash-rados.yaml @@ -1,6 +1,5 @@ roles: - - mon.a - - mds.0 - osd.0 - osd.1 - osd.2 diff --git a/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml b/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml index 0c971e034bc21..9d4f571c91c52 100644 --- a/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml +++ b/suites/rados/singleton/all/thrash_cache_writeback_forward_none.yaml @@ -1,6 +1,5 @@ roles: - - mon.a - - mds.0 - osd.0 - osd.1 - osd.2 diff --git a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml index 05aed994d9314..70d2ec61673d7 100644 --- a/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml +++ b/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml @@ -1,5 +1,5 @@ roles: -- [mon.a, mds.a, osd.0, osd.1, client.0] +- [mon.a, osd.0, osd.1, client.0] - [mon.b, mon.c, osd.2, osd.3, client.1] tasks: - install: diff --git a/suites/rgw/singleton/all/radosgw-admin.yaml b/suites/rgw/singleton/all/radosgw-admin.yaml index 67aa5f92efe76..837ef623fb9b8 100644 --- a/suites/rgw/singleton/all/radosgw-admin.yaml +++ b/suites/rgw/singleton/all/radosgw-admin.yaml @@ -1,5 +1,5 @@ roles: -- [mon.a, mds.a, osd.0, client.0, osd.1] +- [mon.a, osd.0, client.0, osd.1] tasks: - install: - ceph: diff --git a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml index 4b6d7469ef896..696d6b5fd642b 100644 --- a/suites/rgw/singleton/all/radosgw-convert-to-region.yaml +++ b/suites/rgw/singleton/all/radosgw-convert-to-region.yaml @@ -15,7 +15,7 @@ overrides: size: 2000 stddev: 500 roles: -- [mon.a, mds.a, osd.0, osd.1, client.0] +- [mon.a, osd.0, osd.1, client.0] - [mon.b, mon.c, osd.2, osd.3, client.1] tasks: -- 2.39.5