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 <john.spray@redhat.com>

diff --git a/suites/rados/monthrash/clusters/3-mons.yaml b/suites/rados/monthrash/clusters/3-mons.yaml
index 6298ff23c553cc0ca308cf33b48094ae4a37f6df..b36db6592bd3dcf63c8585213d56788543f0b2bb 100644 (file)
--- 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 a22e6c5a0fc640af995ec643c259770957f87b08..fdb87c6b324ae45b0850f9fce3ec83742cbbd89b 100644 (file)
--- 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 2d134788a6f073afcbccf1f7e8a6065ab2038e96..b1ab62cc567f2e06e15bfb198df2d28ea8215d99 100644 (file)
--- 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 703cc664f876bf9e6f0c0017ff4c60beefadd17e..309809648da840af4d47a7a32d39b88a7cc3c161 100644 (file)
--- 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 627806603619081545a8a2426af12ec2f2e7ea26..6211cead9afaba895cb262a423e1044f35b2cd4f 100644 (file)
--- 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 b87a158dbb0a5f253377bc6e0b31bf7edc71a743..3d2cf53f5c510568b3267e90728516156ca13913 100644 (file)
--- 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 dca38c67bb55d068658654a996dd7174cce48225..8315aba6a5d59a8107ba3cfb1d1cf88277f1ddb6 100644 (file)
--- 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 b6a4ed27a5151a358ed20aab6557c26ccbdc71bb..d0a4db067cf076d882cdacfb60b161df17dca66b 100644 (file)
--- 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 28a0c041d9eda6eadfd199053ebd548d06ac3d12..c647a61b74b4a7c30b96718130270c6cf5c473c5 100644 (file)
--- 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 15437cf65c73dcc0bfd0b6707810c130f1012e73..17fe5158cac2c1f3f7d714b2a5f502f3552a71de 100644 (file)
--- 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 c6af200d57f0d315d79c588325ee2cb751874355..3d1894c6b6d5679639b312a0930f160589a90a7d 100644 (file)
--- 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 2089c9f56ae1ceaa83b5c9a2a19b57a46e3423a8..a9ec78a763a3085f7be1400b0295c7b4a4c60cfc 100644 (file)
--- 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 bc5a2838ef9098e4b967b3488d6c64408a8c5790..8b091c909249baaab6c493da23255db293e3295a 100644 (file)
--- 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 c31c1e188d3964f9fd47cc754c1079f95f980d08..a0ece14876ded71d6a59db40bc76e5f587d86f2f 100644 (file)
--- 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 9e580f29db6c082b5379ca0cd8f7f80c0941419e..0dbf9b219b290e1b79a682dbf1627777114583a6 100644 (file)
--- 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 2ed5434960c7482afcd58a9f759286ddac677c9e..114073baa4e77350c27c108a1571fba34a33b46f 100644 (file)
--- 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 9bdcb0c3c7348501eb7878bf3af4adc2975808c5..2752a38fd4596adcc72bec1d37c66c2c0348a815 100644 (file)
--- 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 1dd47518a8a969a51c1a099c9dd39475d5ee17c7..7006d7f378312eca087d0bcbdc77b0bf68ffd872 100644 (file)
--- 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 3df9e2ed601aead7d2ecd71131e60c1e290cf089..e6e09d320d34cc0ffdf2542624207a64e9b8439d 100644 (file)
--- 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 6014723ed08c9205baf30f925b8e3034066e195d..0597e43713c1660921a87202bbec7dfc85042d83 100644 (file)
--- 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 524c6b6f570a3cecb5f36e9624d4f70467adb821..f81070fc770e246185417cd376b2a531850bee6a 100644 (file)
--- 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 4e4e8571b356c015240e3108b65f43ed733af1bb..e69198c85e50cf77b74a91be2309118a924b216f 100644 (file)
--- 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 7c18a3b9bb0abed056ba589a04e3f437d252bd5b..781a63eaf6227d768e29a05b7f9a2bef5ceaaf08 100644 (file)
--- 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 e6f99983e02aa7d8fbef9e2f70c0af3d27346363..123f4d44fbed0d916fc53cfd170708794ee29ff7 100644 (file)
--- 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 8307d424533475e5dbfbca6322a6edbe311a039a..a6e1d99f6fec487e1356a15d755c37e58bf7bfaa 100644 (file)
--- 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 a441059bbb8c9d699a949f3f218449230842fe2d..655ea685584c01be5d786514838e089daaec1623 100644 (file)
--- 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 425db55660d762c8a2d2b55a923a2e136828a346..d4855f7aef5f42dc5ad033d10b2f2a18e6b2c404 100644 (file)
--- 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 4bdcf226546e9c636b2651cb554fb5845912f79e..82c47bf3fe7aab113c4c629930b79375fd00a632 100644 (file)
--- 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 0c971e034bc21019a7420c63051b06f6d8919ca8..9d4f571c91c523899c49a47ba16fe73df179f8e0 100644 (file)
--- 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 05aed994d9314648c9e5ff87ced0524334150e30..70d2ec61673d723fdb4b0ef99ff86ab8140b676b 100644 (file)
--- 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 67aa5f92efe765a1569cc0ef8ed3792f3e2ea868..837ef623fb9b8f98d1605fca1e5f3d547962a57b 100644 (file)
--- 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 4b6d7469ef8964840456264930a47ac2b76662a1..696d6b5fd642bf0283d786e86547aa1252afad25 100644 (file)
--- 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: