From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Mar 2017 18:48:19 +0000 (-0500)
Subject: qa/suites: run mgr daemon(s)
X-Git-Tag: v12.0.2~252^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=271a7588b51620d44532c2c242c33a0b5f776179;p=ceph.git

qa/suites: run mgr daemon(s)

Everything up upgrade/, which will be slightly tricky.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/cephfs/clusters/3-mds.yaml b/qa/cephfs/clusters/3-mds.yaml
index c655b90c81cd..ff35ed1a65b4 100644
--- a/qa/cephfs/clusters/3-mds.yaml
+++ b/qa/cephfs/clusters/3-mds.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mgr.y, mds.a, osd.0, osd.1, osd.2]
+- [mon.b, mgr.x, mds.b, mds.c, osd.3, osd.4, osd.5]
 - [client.0]
diff --git a/qa/cephfs/clusters/9-mds.yaml b/qa/cephfs/clusters/9-mds.yaml
index ed554c9fe3c7..c1228b3a1c7f 100644
--- a/qa/cephfs/clusters/9-mds.yaml
+++ b/qa/cephfs/clusters/9-mds.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mgr.y, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
+- [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
 - [client.0]
diff --git a/qa/cephfs/clusters/fixed-2-ucephfs.yaml b/qa/cephfs/clusters/fixed-2-ucephfs.yaml
index bc120ad0b29f..5f4773fc5ae8 100644
--- a/qa/cephfs/clusters/fixed-2-ucephfs.yaml
+++ b/qa/cephfs/clusters/fixed-2-ucephfs.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mds.a, osd.0, osd.1, client.0]
-- [mon.b, mds.a-s, mon.c, osd.2, osd.3]
+- [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]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/clusters/extra-client.yaml b/qa/clusters/extra-client.yaml
index 349439cb331b..2b495374f3d3 100644
--- a/qa/clusters/extra-client.yaml
+++ b/qa/clusters/extra-client.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
 - [client.0]
 - [client.1]
 openstack:
diff --git a/qa/clusters/fixed-1.yaml b/qa/clusters/fixed-1.yaml
index 376860733082..38725b086428 100644
--- a/qa/clusters/fixed-1.yaml
+++ b/qa/clusters/fixed-1.yaml
@@ -7,4 +7,4 @@ overrides:
         osd pool default pg num:  128
         osd pool default pgp num:  128
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml
index 861e50919315..6886d1701b8a 100644
--- a/qa/clusters/fixed-2.yaml
+++ b/qa/clusters/fixed-2.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
-- [mon.b, osd.3, osd.4, osd.5, client.1]
+- [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, client.0]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1]
 openstack:
 - volumes: # attached to each instance
     count: 3
diff --git a/qa/clusters/fixed-3-cephfs.yaml b/qa/clusters/fixed-3-cephfs.yaml
index 499c84c37180..7e2e5f05c765 100644
--- a/qa/clusters/fixed-3-cephfs.yaml
+++ b/qa/clusters/fixed-3-cephfs.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mds.a, osd.0, osd.1]
-- [mon.b, mds.a-s, mon.c, osd.2, osd.3]
+- [mon.a, mds.a, mgr.x, osd.0, osd.1]
+- [mon.b, mds.a-s, mon.c, mgr.y, osd.2, osd.3]
 - [client.0]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/clusters/fixed-3.yaml b/qa/clusters/fixed-3.yaml
index 8e622d2db946..3ed30b94ff08 100644
--- a/qa/clusters/fixed-3.yaml
+++ b/qa/clusters/fixed-3.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2]
+- [mon.b, mgr.y, osd.3, osd.4, osd.5]
 - [client.0]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/clusters/fixed-4.yaml b/qa/clusters/fixed-4.yaml
index 7f051dc1fed4..86eb2c63439e 100644
--- a/qa/clusters/fixed-4.yaml
+++ b/qa/clusters/fixed-4.yaml
@@ -1,5 +1,5 @@
 roles: 
-- [mon.a, osd.0, osd.4, osd.8, osd.12] 
+- [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
 - [mon.b, osd.1, osd.5, osd.9, osd.13] 
 - [mon.c, osd.2, osd.6, osd.10, osd.14] 
-- [osd.3, osd.7, osd.11, osd.15, client.0] 
+- [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
diff --git a/qa/erasure-code/ec-feature-plugins-v2.yaml b/qa/erasure-code/ec-feature-plugins-v2.yaml
index 102a45289245..f2d374dd98a6 100644
--- a/qa/erasure-code/ec-feature-plugins-v2.yaml
+++ b/qa/erasure-code/ec-feature-plugins-v2.yaml
@@ -12,6 +12,7 @@ roles:
   - osd.1
 - - osd.2
   - mon.c
+  - mgr.x
 tasks:
 #
 # Install firefly
diff --git a/qa/erasure-code/ec-feature-plugins-v3.yaml b/qa/erasure-code/ec-feature-plugins-v3.yaml
index 66a5726d12ba..332b94407285 100644
--- a/qa/erasure-code/ec-feature-plugins-v3.yaml
+++ b/qa/erasure-code/ec-feature-plugins-v3.yaml
@@ -12,6 +12,7 @@ roles:
   - osd.1
 - - osd.2
   - mon.c
+  - mgr.x
 tasks:
 #
 # Install hammer
diff --git a/qa/suites/big/rados-thrash/clusters/big.yaml b/qa/suites/big/rados-thrash/clusters/big.yaml
index 18197ad8571a..fd8c2174118e 100644
--- a/qa/suites/big/rados-thrash/clusters/big.yaml
+++ b/qa/suites/big/rados-thrash/clusters/big.yaml
@@ -1,7 +1,7 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a]
-- [osd.3, osd.4, osd.5, client.1, mon.b]
-- [osd.6, osd.7, osd.8, client.2, mon.c]
+- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
+- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
+- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
 - [osd.9, osd.10, osd.11, client.3, mon.d]
 - [osd.12, osd.13, osd.14, client.4, mon.e]
 - [osd.15, osd.16, osd.17, client.5]
diff --git a/qa/suites/big/rados-thrash/clusters/medium.yaml b/qa/suites/big/rados-thrash/clusters/medium.yaml
index 48b66dd5ca35..ecded01b4ff9 100644
--- a/qa/suites/big/rados-thrash/clusters/medium.yaml
+++ b/qa/suites/big/rados-thrash/clusters/medium.yaml
@@ -1,7 +1,7 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a]
-- [osd.3, osd.4, osd.5, client.1, mon.b]
-- [osd.6, osd.7, osd.8, client.2, mon.c]
+- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
+- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
+- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
 - [osd.9, osd.10, osd.11, client.3, mon.d]
 - [osd.12, osd.13, osd.14, client.4, mon.e]
 - [osd.15, osd.16, osd.17, client.5]
diff --git a/qa/suites/big/rados-thrash/clusters/small.yaml b/qa/suites/big/rados-thrash/clusters/small.yaml
index b5a79906c690..d0aecd00875f 100644
--- a/qa/suites/big/rados-thrash/clusters/small.yaml
+++ b/qa/suites/big/rados-thrash/clusters/small.yaml
@@ -1,6 +1,6 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a]
-- [osd.3, osd.4, osd.5, client.1, mon.b]
-- [osd.6, osd.7, osd.8, client.2, mon.c]
+- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
+- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
+- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
 - [osd.9, osd.10, osd.11, client.3, mon.d]
 - [osd.12, osd.13, osd.14, client.4, mon.e]
diff --git a/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml b/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml
index c67a5cb63b9d..0b4b6b157138 100644
--- a/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml
@@ -2,8 +2,8 @@ meta:
 - desc: "3-node cluster"
 roles:
 - [mon.a, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, osd.3, osd.4, osd.5]
-- [mon.c, osd.6, osd.7, osd.8, client.0]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5]
+- [mon.c, mgr.y, osd.6, osd.7, osd.8, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 3
diff --git a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
index 0d651ca7641d..fc4873ceed1a 100644
--- a/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
+++ b/qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - mds.0
   - osd.0
 - - osd.1
diff --git a/qa/suites/ceph-disk/basic/tasks/ceph-disk.yaml b/qa/suites/ceph-disk/basic/tasks/ceph-disk.yaml
index b7655a2fc541..98adab33e577 100644
--- a/qa/suites/ceph-disk/basic/tasks/ceph-disk.yaml
+++ b/qa/suites/ceph-disk/basic/tasks/ceph-disk.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - client.0
 - - osd.0
   - osd.1
diff --git a/qa/suites/dummy/all/nop.yaml b/qa/suites/dummy/all/nop.yaml
index e027e553395c..0f00ffc88702 100644
--- a/qa/suites/dummy/all/nop.yaml
+++ b/qa/suites/dummy/all/nop.yaml
@@ -1,5 +1,5 @@
 roles:
-    - [mon.a, mds.a, osd.0, osd.1, client.0]
+    - [mon.a, mgr.x, mds.a, osd.0, osd.1, client.0]
 
 tasks:
     - nop:
diff --git a/qa/suites/experimental/multimds/clusters/7-multimds.yaml b/qa/suites/experimental/multimds/clusters/7-multimds.yaml
index 17cfd7b3d793..d4bb14143d3e 100644
--- a/qa/suites/experimental/multimds/clusters/7-multimds.yaml
+++ b/qa/suites/experimental/multimds/clusters/7-multimds.yaml
@@ -1,7 +1,7 @@
 roles:
-- [mon.a, mds.a, mds.a-s]
-- [mon.b, mds.b, mds.b-s]
-- [mon.c, mds.c, mds.c-s]
+- [mon.a, mgr.x, mds.a, mds.a-s]
+- [mon.b, mgr.y, mds.b, mds.b-s]
+- [mon.c, mgr.z, mds.c, mds.c-s]
 - [osd.0]
 - [osd.1]
 - [osd.2]
diff --git a/qa/suites/fs/multiclient/clusters/three_clients.yaml b/qa/suites/fs/multiclient/clusters/three_clients.yaml
index 1fc1b4454404..78b912f72528 100644
--- a/qa/suites/fs/multiclient/clusters/three_clients.yaml
+++ b/qa/suites/fs/multiclient/clusters/three_clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2]
 - [client.2]
 - [client.1]
 - [client.0]
diff --git a/qa/suites/fs/multiclient/clusters/two_clients.yaml b/qa/suites/fs/multiclient/clusters/two_clients.yaml
index e6d82601cfdc..9586e6c8ffd3 100644
--- a/qa/suites/fs/multiclient/clusters/two_clients.yaml
+++ b/qa/suites/fs/multiclient/clusters/two_clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2]
 - [client.1]
 - [client.0]
 
diff --git a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
index b5ff712cb472..52c5d7e0171a 100644
--- a/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
+++ b/qa/suites/fs/multifs/clusters/2-remote-clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, mon.b, mds.a, mds.b, client.1]
+- [mon.a, mgr.x, osd.0, mon.b, mds.a, mds.b, client.1]
 - [mds.c, mds.d, mon.c, client.0, osd.1, osd.2]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
index 6b5e23b6c1f7..f9e423e2fc3c 100644
--- a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
+++ b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, mds.a, mds.b, client.1, client.2, client.3]
+- [mon.a, mgr.x, osd.0, mds.a, mds.b, client.1, client.2, client.3]
 - [client.0, osd.1, osd.2]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
index ba2442b27ca7..a4bafed29a4a 100644
--- a/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
+++ b/qa/suites/fs/standbyreplay/clusters/standby-replay.yaml
@@ -6,7 +6,7 @@ overrides:
                 mds standby replay: true
 
 roles:
-- [mon.a, mds.a, mds.b-s-0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, mds.a, mds.b-s-0, osd.0, osd.1, client.0]
 - [mon.b, mds.c-s-0, mds.d-s-0, mon.c, osd.2, osd.3]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
index cceea69e2636..d02524866c3f 100644
--- a/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
+++ b/qa/suites/fs/thrash/clusters/mds-1active-1standby.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, mds.b-s-a]
-- [mon.b, mds.a, osd.3, osd.4, osd.5, client.0]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 3
diff --git a/qa/suites/hadoop/basic/clusters/fixed-3.yaml b/qa/suites/hadoop/basic/clusters/fixed-3.yaml
index 52efc6930743..6fc0af68f4b6 100644
--- a/qa/suites/hadoop/basic/clusters/fixed-3.yaml
+++ b/qa/suites/hadoop/basic/clusters/fixed-3.yaml
@@ -9,8 +9,8 @@ overrides:
         client permissions: false
 roles:
 - [mon.0, mds.0, osd.0, hadoop.master.0]
-- [mon.1, osd.1, hadoop.slave.0]
-- [mon.2, hadoop.slave.1, client.0]
+- [mon.1, mgr.x, osd.1, hadoop.slave.0]
+- [mon.2, mgr.y, hadoop.slave.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 1
diff --git a/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml b/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml
index 26e029d0dbe3..90b6cf626c8a 100644
--- a/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml
+++ b/qa/suites/kcephfs/mixed-clients/clusters/2-clients.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, mds.a, osd.0, osd.1]
+- [mon.a, mgr.x, mds.a, osd.0, osd.1]
 - [mon.b, mon.c, osd.2, osd.3]
 - [client.0]
 - [client.1]
diff --git a/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml b/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml
index 7bb4e3255beb..1d432addb4af 100644
--- a/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml
+++ b/qa/suites/kcephfs/recovery/clusters/4-remote-clients.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, osd.0, mds.a, mds.c, client.2]
-- [osd.1, osd.2, mds.b, mds.d, client.3]
+- [mgr.x, osd.1, osd.2, mds.b, mds.d, client.3]
 - [client.0]
 - [client.1]
 openstack:
diff --git a/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml b/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
index 237a4947f2a8..d27054a84822 100644
--- a/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
+++ b/qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
 - [client.0]
 - [client.1]
 openstack:
diff --git a/qa/suites/krbd/unmap/clusters/separate-client.yaml b/qa/suites/krbd/unmap/clusters/separate-client.yaml
index a2184eefc5d1..be13431890f7 100644
--- a/qa/suites/krbd/unmap/clusters/separate-client.yaml
+++ b/qa/suites/krbd/unmap/clusters/separate-client.yaml
@@ -8,7 +8,7 @@ overrides:
         osd pool default pg num:  128
         osd pool default pgp num:  128
 roles:
-- [mon.a, osd.0, osd.1, osd.2]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2]
 - [client.0]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/marginal/basic/clusters/fixed-3.yaml b/qa/suites/marginal/basic/clusters/fixed-3.yaml
index 0038432afa7d..5e23c9e4f44c 100644
--- a/qa/suites/marginal/basic/clusters/fixed-3.yaml
+++ b/qa/suites/marginal/basic/clusters/fixed-3.yaml
@@ -1,4 +1,4 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
 - [client.0]
diff --git a/qa/suites/marginal/fs-misc/clusters/two_clients.yaml b/qa/suites/marginal/fs-misc/clusters/two_clients.yaml
index 2258befd8bf9..19d312dce579 100644
--- a/qa/suites/marginal/fs-misc/clusters/two_clients.yaml
+++ b/qa/suites/marginal/fs-misc/clusters/two_clients.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2]
 - [client.1]
 - [client.0]
diff --git a/qa/suites/marginal/mds_restart/clusters/one_mds.yaml b/qa/suites/marginal/mds_restart/clusters/one_mds.yaml
index 9e11c02a36c1..45c3e80e57d8 100644
--- a/qa/suites/marginal/mds_restart/clusters/one_mds.yaml
+++ b/qa/suites/marginal/mds_restart/clusters/one_mds.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+- [mon.a, mon.b, mon.c, mgr.x, osd.0, osd.1, osd.2]
 - [mds.a]
 - [client.0]
diff --git a/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml b/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml
index 088d9f0d31d2..2995ea9f358c 100644
--- a/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml
+++ b/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml
@@ -1,5 +1,5 @@
 roles:
 - [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.b, mds.c, osd.3, osd.4, osd.5]
 - [client.0]
 - [client.1]
diff --git a/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml b/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml
index be824f0f5542..083a07c25e10 100644
--- a/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml
+++ b/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml
@@ -1,5 +1,5 @@
 roles:
 - [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
 - [client.0]
 - [client.1]
diff --git a/qa/suites/mixed-clients/basic/clusters/fixed-3.yaml b/qa/suites/mixed-clients/basic/clusters/fixed-3.yaml
index e1d3c7b7932b..134bca1b9a31 100644
--- a/qa/suites/mixed-clients/basic/clusters/fixed-3.yaml
+++ b/qa/suites/mixed-clients/basic/clusters/fixed-3.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.a, mds.a, osd.0, osd.1]
+- [mon.a, mgr.x, mds.a, osd.0, osd.1]
 - [mon.b, mon.c, osd.2, osd.3, client.0]
 - [client.1]
diff --git a/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml b/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml
index acf5deeee8fa..1a415ef249e7 100644
--- a/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml
+++ b/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml
@@ -1,4 +1,4 @@
 roles:
 - [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2, mds.d-s]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5, mds.e-s]
+- [mon.b, mgr.x, mds.b, mds.c, osd.3, osd.4, osd.5, mds.e-s]
 - [client.0]
diff --git a/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml b/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml
index c51bc16dffd4..4a8334c66a2d 100644
--- a/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml
+++ b/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml
@@ -1,4 +1,4 @@
 roles:
 - [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2, mds.j-s, mds.k-s]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, mds.l-s]
+- [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, mds.l-s]
 - [client.0]
diff --git a/qa/suites/powercycle/osd/clusters/3osd-1per-target.yaml b/qa/suites/powercycle/osd/clusters/3osd-1per-target.yaml
index d5503a40c863..8ba3c691e1ab 100644
--- a/qa/suites/powercycle/osd/clusters/3osd-1per-target.yaml
+++ b/qa/suites/powercycle/osd/clusters/3osd-1per-target.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, mon.1, mon.2, mds.0, client.0]
+- [mon.a, mon.b, mon.c, mgr.x, mgr.y, mds.0, client.0]
 - [osd.0]
 - [osd.1]
 - [osd.2]
diff --git a/qa/suites/rados/monthrash/clusters/3-mons.yaml b/qa/suites/rados/monthrash/clusters/3-mons.yaml
index b3a2caf7212e..4b721ef80c76 100644
--- a/qa/suites/rados/monthrash/clusters/3-mons.yaml
+++ b/qa/suites/rados/monthrash/clusters/3-mons.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, osd.3, osd.4, osd.5, client.0]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.0]
 openstack:
   - volumes: # attached to each instance
       count: 3
diff --git a/qa/suites/rados/monthrash/clusters/9-mons.yaml b/qa/suites/rados/monthrash/clusters/9-mons.yaml
index 543321184343..a2874c1d0e5d 100644
--- a/qa/suites/rados/monthrash/clusters/9-mons.yaml
+++ b/qa/suites/rados/monthrash/clusters/9-mons.yaml
@@ -1,6 +1,6 @@
 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, osd.3, osd.4, osd.5, client.0]
+- [mon.f, mon.g, mon.h, mon.i, mgr.x, osd.3, osd.4, osd.5, client.0]
 openstack:
   - volumes: # attached to each instance
       count: 3
diff --git a/qa/suites/rados/multimon/clusters/21.yaml b/qa/suites/rados/multimon/clusters/21.yaml
index 646ff15d45e4..b6d04a022d80 100644
--- a/qa/suites/rados/multimon/clusters/21.yaml
+++ b/qa/suites/rados/multimon/clusters/21.yaml
@@ -1,6 +1,6 @@
 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]
+- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mgr.x]
 - [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/rados/multimon/clusters/3.yaml b/qa/suites/rados/multimon/clusters/3.yaml
index e663324b5d61..7b8c62645ddd 100644
--- a/qa/suites/rados/multimon/clusters/3.yaml
+++ b/qa/suites/rados/multimon/clusters/3.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.c, osd.0]
-- [mon.b, osd.1]
+- [mon.b, mgr.x, osd.1]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/multimon/clusters/6.yaml b/qa/suites/rados/multimon/clusters/6.yaml
index b16e3267c06f..715cbe855ae3 100644
--- a/qa/suites/rados/multimon/clusters/6.yaml
+++ b/qa/suites/rados/multimon/clusters/6.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mon.c, mon.e, osd.0]
-- [mon.b, mon.d, mon.f, osd.1]
+- [mon.a, mon.c, mon.e, mgr.x, osd.0]
+- [mon.b, mon.d, mon.f, mgr.y, osd.1]
 openstack:
 - volumes: # attached to each instance
     count: 1
diff --git a/qa/suites/rados/multimon/clusters/9.yaml b/qa/suites/rados/multimon/clusters/9.yaml
index c2c7b494ed80..d029c4c594da 100644
--- a/qa/suites/rados/multimon/clusters/9.yaml
+++ b/qa/suites/rados/multimon/clusters/9.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, mon.d, mon.g, osd.0]
-- [mon.b, mon.e, mon.h]
+- [mon.b, mon.e, mon.h, mgr.x]
 - [mon.c, mon.f, mon.i, osd.1]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/rados/objectstore/alloc-hint.yaml b/qa/suites/rados/objectstore/alloc-hint.yaml
index cc608663c546..d40143c17a78 100644
--- a/qa/suites/rados/objectstore/alloc-hint.yaml
+++ b/qa/suites/rados/objectstore/alloc-hint.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
 openstack:
   - volumes: # attached to each instance
       count: 3
diff --git a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
index e062459c6917..215d0f08f9b6 100644
--- a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 6
diff --git a/qa/suites/rados/objectstore/filejournal.yaml b/qa/suites/rados/objectstore/filejournal.yaml
index 7e401d168f5e..b0af80084f8c 100644
--- a/qa/suites/rados/objectstore/filejournal.yaml
+++ b/qa/suites/rados/objectstore/filejournal.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml b/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
index 53a93f67f449..58b5197d61b4 100644
--- a/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
+++ b/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/objectstore/filestore-idempotent.yaml b/qa/suites/rados/objectstore/filestore-idempotent.yaml
index 64dd3a7352d3..2d3f3c69212d 100644
--- a/qa/suites/rados/objectstore/filestore-idempotent.yaml
+++ b/qa/suites/rados/objectstore/filestore-idempotent.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/objectstore/fusestore.yaml b/qa/suites/rados/objectstore/fusestore.yaml
index 78f61c2ad4cc..1c34fcaea2df 100644
--- a/qa/suites/rados/objectstore/fusestore.yaml
+++ b/qa/suites/rados/objectstore/fusestore.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - workunit:
diff --git a/qa/suites/rados/objectstore/keyvaluedb.yaml b/qa/suites/rados/objectstore/keyvaluedb.yaml
index 6921c5d572e9..efff8d379306 100644
--- a/qa/suites/rados/objectstore/keyvaluedb.yaml
+++ b/qa/suites/rados/objectstore/keyvaluedb.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - exec:
diff --git a/qa/suites/rados/objectstore/objectcacher-stress.yaml b/qa/suites/rados/objectstore/objectcacher-stress.yaml
index 386d12c098e3..e407a391807d 100644
--- a/qa/suites/rados/objectstore/objectcacher-stress.yaml
+++ b/qa/suites/rados/objectstore/objectcacher-stress.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/objectstore/objectstore.yaml b/qa/suites/rados/objectstore/objectstore.yaml
index 910e374ece9a..b5442342b187 100644
--- a/qa/suites/rados/objectstore/objectstore.yaml
+++ b/qa/suites/rados/objectstore/objectstore.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
index 8cd36b8342e2..5009ee617035 100644
--- a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, mds.a, osd.0, osd.1, osd.2, client.0, client.1]
+- [mon.a, mgr.x, mds.a, osd.0, osd.1, osd.2, client.0, client.1]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml b/qa/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml
index d0a4db067cf0..8634362339f7 100644
--- a/qa/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/ceph-post-file.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
 tasks:
 - install:
 - workunit:
diff --git a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
index 4a9de25e1807..e0badd4d3afa 100644
--- a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
index 6b46bc5bf3b2..e21086a6be83 100644
--- a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
@@ -1,6 +1,6 @@
 # verify #13098 fix
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
 overrides:
   ceph:
     log-whitelist:
diff --git a/qa/suites/rados/singleton-nomsgr/all/msgr.yaml b/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
index 1f9a695adab0..98b509526e6b 100644
--- a/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - exec:
diff --git a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
index 78f6e96c9db7..0afc444a7c46 100644
--- a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
index 776a6a921dd1..c05ad133be36 100644
--- a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
@@ -15,7 +15,7 @@ overrides:
       mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
       osd: [--tool=memcheck]
 roles:
-- [mon.0, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rados/singleton/all/admin-socket.yaml b/qa/suites/rados/singleton/all/admin-socket.yaml
index 5a61e21e90c2..afbe9702e585 100644
--- a/qa/suites/rados/singleton/all/admin-socket.yaml
+++ b/qa/suites/rados/singleton/all/admin-socket.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - client.a
diff --git a/qa/suites/rados/singleton/all/cephtool.yaml b/qa/suites/rados/singleton/all/cephtool.yaml
index b0a886339a88..55f8822f2b10 100644
--- a/qa/suites/rados/singleton/all/cephtool.yaml
+++ b/qa/suites/rados/singleton/all/cephtool.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/divergent_priors.yaml b/qa/suites/rados/singleton/all/divergent_priors.yaml
index 3103703edf4e..bb7c2b57f50f 100644
--- a/qa/suites/rados/singleton/all/divergent_priors.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors.yaml
@@ -1,5 +1,6 @@
 roles:
-- - mon.0
+- - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/divergent_priors2.yaml b/qa/suites/rados/singleton/all/divergent_priors2.yaml
index dd00b87003ab..ab749f1b516e 100644
--- a/qa/suites/rados/singleton/all/divergent_priors2.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors2.yaml
@@ -1,5 +1,6 @@
 roles:
-- - mon.0
+- - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/dump-stuck.yaml b/qa/suites/rados/singleton/all/dump-stuck.yaml
index f153de629546..7d3b443021bb 100644
--- a/qa/suites/rados/singleton/all/dump-stuck.yaml
+++ b/qa/suites/rados/singleton/all/dump-stuck.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
 openstack:
diff --git a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
index 7c4b5f0e0398..6ceefe1222e3 100644
--- a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
index fbc24e0d17e7..15f4710bd9bf 100644
--- a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/lost-unfound.yaml b/qa/suites/rados/singleton/all/lost-unfound.yaml
index 31649dbb0da8..3f22ba3c0136 100644
--- a/qa/suites/rados/singleton/all/lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/mon-config-keys.yaml b/qa/suites/rados/singleton/all/mon-config-keys.yaml
index b905691a9f4c..7bb4f65030ed 100644
--- a/qa/suites/rados/singleton/all/mon-config-keys.yaml
+++ b/qa/suites/rados/singleton/all/mon-config-keys.yaml
@@ -1,7 +1,8 @@
 roles:
-- - mon.0
-  - mon.1
-  - mon.2
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/mon-seesaw.yaml b/qa/suites/rados/singleton/all/mon-seesaw.yaml
index a5cd937791b0..ccd980fded7b 100644
--- a/qa/suites/rados/singleton/all/mon-seesaw.yaml
+++ b/qa/suites/rados/singleton/all/mon-seesaw.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/mon-thrasher.yaml b/qa/suites/rados/singleton/all/mon-thrasher.yaml
index 5cadddabe6be..1b4622998f9b 100644
--- a/qa/suites/rados/singleton/all/mon-thrasher.yaml
+++ b/qa/suites/rados/singleton/all/mon-thrasher.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - client.0
diff --git a/qa/suites/rados/singleton/all/osd-backfill.yaml b/qa/suites/rados/singleton/all/osd-backfill.yaml
index c9263db00ec5..f84a0df8d660 100644
--- a/qa/suites/rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/rados/singleton/all/osd-backfill.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
index c7f053c40f3b..773cb2480a6f 100644
--- a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/osd-recovery.yaml b/qa/suites/rados/singleton/all/osd-recovery.yaml
index c86dc872067e..214d7f20cc74 100644
--- a/qa/suites/rados/singleton/all/osd-recovery.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery.yaml
@@ -2,6 +2,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/peer.yaml b/qa/suites/rados/singleton/all/peer.yaml
index 9eaaa946e83b..6e22b44563e9 100644
--- a/qa/suites/rados/singleton/all/peer.yaml
+++ b/qa/suites/rados/singleton/all/peer.yaml
@@ -1,7 +1,8 @@
 roles:
-- - mon.0
-  - mon.1
-  - mon.2
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
index 552ed26c28be..f7e61c962633 100644
--- a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/radostool.yaml b/qa/suites/rados/singleton/all/radostool.yaml
index 1df407949705..8bc9dbdcd0f0 100644
--- a/qa/suites/rados/singleton/all/radostool.yaml
+++ b/qa/suites/rados/singleton/all/radostool.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/rebuild-mondb.yaml b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
index 5ce1cd0a8931..c3be13ae6a2c 100644
--- a/qa/suites/rados/singleton/all/rebuild-mondb.yaml
+++ b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
@@ -1,7 +1,8 @@
 roles:
-- - mon.0
-  - mon.1
-  - mon.2
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/reg11184.yaml b/qa/suites/rados/singleton/all/reg11184.yaml
index 8bc502a14561..5521a27f04f1 100644
--- a/qa/suites/rados/singleton/all/reg11184.yaml
+++ b/qa/suites/rados/singleton/all/reg11184.yaml
@@ -1,5 +1,6 @@
 roles:
-- - mon.0
+- - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
index 278ff1aa5ba9..c64593212a5f 100644
--- a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
+++ b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.0]
+- [mon.a, mgr.x]
 - [osd.0, osd.1, osd.2, client.0]
 
 tasks:
diff --git a/qa/suites/rados/singleton/all/rest-api.yaml b/qa/suites/rados/singleton/all/rest-api.yaml
index ce39a6b2cd4f..cbd90e4097da 100644
--- a/qa/suites/rados/singleton/all/rest-api.yaml
+++ b/qa/suites/rados/singleton/all/rest-api.yaml
@@ -1,7 +1,8 @@
 roles:
-- - mon.0
-  - mon.1
-  - mon.2
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml b/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
index 65c875a9a198..0835d22bfa6c 100644
--- a/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
+++ b/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
@@ -6,7 +6,7 @@ overrides:
         osd max object name len: 460
         osd max object namespace len: 64
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rados/singleton/all/thrash-rados.yaml b/qa/suites/rados/singleton/all/thrash-rados.yaml
index af963106a2a2..49e3e8799c14 100644
--- a/qa/suites/rados/singleton/all/thrash-rados.yaml
+++ b/qa/suites/rados/singleton/all/thrash-rados.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
index 02c228d77931..1875da409a25 100644
--- a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
+++ b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
index 48900f392dfa..ad1fd17d5f58 100644
--- a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
+++ b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
@@ -1,7 +1,8 @@
 roles:
-- - mon.0
-  - mon.1
-  - mon.2
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/rados/thrash-erasure-code-big/cluster/12-osds.yaml b/qa/suites/rados/thrash-erasure-code-big/cluster/12-osds.yaml
index 11317e6ee74d..db86583f22c8 100644
--- a/qa/suites/rados/thrash-erasure-code-big/cluster/12-osds.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/cluster/12-osds.yaml
@@ -2,4 +2,4 @@ roles:
 - [osd.0, osd.1, osd.2, client.0, mon.a]
 - [osd.3, osd.4, osd.5, mon.b]
 - [osd.6, osd.7, osd.8, mon.c]
-- [osd.9, osd.10, osd.11]
+- [osd.9, osd.10, osd.11, mgr.x]
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
index fd200d752a26..2872225e9934 100644
--- a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
@@ -13,6 +13,8 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
+  - mgr.y
   - mds.a
   - osd.0
   - osd.1
diff --git a/qa/suites/rbd/mirror/cluster/2-node.yaml b/qa/suites/rbd/mirror/cluster/2-node.yaml
index e88b12b1381a..8eb30c45e6f2 100644
--- a/qa/suites/rbd/mirror/cluster/2-node.yaml
+++ b/qa/suites/rbd/mirror/cluster/2-node.yaml
@@ -3,6 +3,7 @@ meta:
 roles:
 - - cluster1.mon.a
   - cluster1.mon.b
+  - cluster1.mgr.x
   - cluster1.osd.0
   - cluster1.osd.1
   - cluster1.osd.2
@@ -12,6 +13,7 @@ roles:
 - - cluster1.mon.c
   - cluster2.mon.a
   - cluster2.mon.b
+  - cluster2.mgr.x
   - cluster2.osd.0
   - cluster2.osd.1
   - cluster2.osd.2
diff --git a/qa/suites/rbd/nbd/cluster/fixed-3.yaml b/qa/suites/rbd/nbd/cluster/fixed-3.yaml
index 455de4f98311..182589152d21 100644
--- a/qa/suites/rbd/nbd/cluster/fixed-3.yaml
+++ b/qa/suites/rbd/nbd/cluster/fixed-3.yaml
@@ -1,4 +1,4 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5]
 - [client.0]
diff --git a/qa/suites/rbd/openstack/clusters/fixed-2.yaml b/qa/suites/rbd/openstack/clusters/fixed-2.yaml
index 93be2fce61a5..473c205411f2 100644
--- a/qa/suites/rbd/openstack/clusters/fixed-2.yaml
+++ b/qa/suites/rbd/openstack/clusters/fixed-2.yaml
@@ -5,5 +5,5 @@ overrides:
         osd pool default size: 2
         osd crush chooseleaf type: 0
 roles:
-- [mon.a, osd.0, osd.1, osd.2]
+- [mon.a, mgr.x, osd.0, osd.1, osd.2]
 - [client.0]
diff --git a/qa/suites/rbd/singleton/all/admin_socket.yaml b/qa/suites/rbd/singleton/all/admin_socket.yaml
index 6394cc7ef00c..22dbd8c03348 100644
--- a/qa/suites/rbd/singleton/all/admin_socket.yaml
+++ b/qa/suites/rbd/singleton/all/admin_socket.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/formatted-output.yaml b/qa/suites/rbd/singleton/all/formatted-output.yaml
index 8bed75c18894..f6a19910c12b 100644
--- a/qa/suites/rbd/singleton/all/formatted-output.yaml
+++ b/qa/suites/rbd/singleton/all/formatted-output.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/merge_diff.yaml b/qa/suites/rbd/singleton/all/merge_diff.yaml
index 76a999db8f31..31b269d63093 100644
--- a/qa/suites/rbd/singleton/all/merge_diff.yaml
+++ b/qa/suites/rbd/singleton/all/merge_diff.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/permissions.yaml b/qa/suites/rbd/singleton/all/permissions.yaml
index bb7e12b79687..c00a5c9b8fb8 100644
--- a/qa/suites/rbd/singleton/all/permissions.yaml
+++ b/qa/suites/rbd/singleton/all/permissions.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml b/qa/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml
index bf67dbab3d11..bfb203904189 100644
--- a/qa/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml
+++ b/qa/suites/rbd/singleton/all/qemu-iotests-no-cache.yaml
@@ -1,6 +1,6 @@
 exclude_arch: armv7l
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml b/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
index 823e67202c31..bf1b4befe032 100644
--- a/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
+++ b/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
@@ -1,6 +1,6 @@
 exclude_arch: armv7l
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml b/qa/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml
index 64667d9df29f..908a67804039 100644
--- a/qa/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml
+++ b/qa/suites/rbd/singleton/all/qemu-iotests-writethrough.yaml
@@ -1,6 +1,6 @@
 exclude_arch: armv7l
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml b/qa/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml
index 434575d382d4..f14bd7431b2f 100644
--- a/qa/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml
+++ b/qa/suites/rbd/singleton/all/rbd-vs-unmanaged-snaps.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/rbd_mirror.yaml b/qa/suites/rbd/singleton/all/rbd_mirror.yaml
index 9caf64464ad7..21624164beba 100644
--- a/qa/suites/rbd/singleton/all/rbd_mirror.yaml
+++ b/qa/suites/rbd/singleton/all/rbd_mirror.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/read-flags-no-cache.yaml b/qa/suites/rbd/singleton/all/read-flags-no-cache.yaml
index a28875cc5631..cf602cbb154e 100644
--- a/qa/suites/rbd/singleton/all/read-flags-no-cache.yaml
+++ b/qa/suites/rbd/singleton/all/read-flags-no-cache.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/read-flags-writeback.yaml b/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
index 4f2bd19a92e1..e763bcc34e9c 100644
--- a/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
+++ b/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/read-flags-writethrough.yaml b/qa/suites/rbd/singleton/all/read-flags-writethrough.yaml
index 543a84958de7..fc499d495068 100644
--- a/qa/suites/rbd/singleton/all/read-flags-writethrough.yaml
+++ b/qa/suites/rbd/singleton/all/read-flags-writethrough.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rbd/singleton/all/verify_pool.yaml b/qa/suites/rbd/singleton/all/verify_pool.yaml
index 92b110277edf..5ab06f74944b 100644
--- a/qa/suites/rbd/singleton/all/verify_pool.yaml
+++ b/qa/suites/rbd/singleton/all/verify_pool.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0]
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rest/basic/tasks/rest_test.yaml b/qa/suites/rest/basic/tasks/rest_test.yaml
index 1adc95390aea..bf7f5aa3a5e7 100644
--- a/qa/suites/rest/basic/tasks/rest_test.yaml
+++ b/qa/suites/rest/basic/tasks/rest_test.yaml
@@ -1,5 +1,6 @@
 roles:
 - - mon.a
+  - mgr.x
   - mds.a
   - osd.0
   - osd.1
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 4885bf782033..03d7c612c4a3 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,6 @@
 roles:
 - [mon.a, osd.0, client.0]
-- [osd.1, osd.2, osd.3, client.1]
+- [mgr.x, osd.1, osd.2, osd.3, client.1]
 openstack:
 - volumes: # attached to each instance
     count: 3
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 93b755178985..d28dec9e7a12 100644
--- a/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin-multi-region.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, 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
diff --git a/qa/suites/rgw/singleton/all/radosgw-admin.yaml b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
index ccdafad20693..aada29b5b334 100644
--- a/qa/suites/rgw/singleton/all/radosgw-admin.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
@@ -1,6 +1,6 @@
 roles:
 - [mon.a, osd.0]
-- [client.0, osd.1, osd.2, osd.3]
+- [mgr.x, client.0, osd.1, osd.2, osd.3]
 openstack:
 - volumes: # attached to each instance
     count: 3
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 5da11351a207..8e81240e25ae 100644
--- a/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-convert-to-region.yaml
@@ -15,7 +15,7 @@ overrides:
         size: 2000
         stddev: 500
 roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
+- [mon.a, mgr.x, 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
diff --git a/qa/suites/samba/clusters/samba-basic.yaml b/qa/suites/samba/clusters/samba-basic.yaml
index 86c71b81daf4..af432f61038e 100644
--- a/qa/suites/samba/clusters/samba-basic.yaml
+++ b/qa/suites/samba/clusters/samba-basic.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
+- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1]
 - [samba.0, client.0, client.1]
 openstack:
 - volumes: # attached to each instance
diff --git a/qa/suites/smoke/systemd/clusters/fixed-4.yaml b/qa/suites/smoke/systemd/clusters/fixed-4.yaml
index 8e5a98742057..43b4de755cb8 100644
--- a/qa/suites/smoke/systemd/clusters/fixed-4.yaml
+++ b/qa/suites/smoke/systemd/clusters/fixed-4.yaml
@@ -1,5 +1,5 @@
 roles:
-- [mon.a, osd.0]
+- [mon.a, mgr.x, osd.0]
 - [osd.1, osd.2]
 - [mds.a, osd.3]
 - [mon.b, client.0]
diff --git a/qa/suites/stress/thrash/clusters/16-osd.yaml b/qa/suites/stress/thrash/clusters/16-osd.yaml
index 373dd4052c36..76232339bcfb 100644
--- a/qa/suites/stress/thrash/clusters/16-osd.yaml
+++ b/qa/suites/stress/thrash/clusters/16-osd.yaml
@@ -1,7 +1,7 @@
 roles:
-- [mon.0, mds.a, osd.0]
-- [mon.1, osd.1]
-- [mon.2, osd.2]
+- [mon.a, mds.a, osd.0]
+- [mon.b, mgr.x, osd.1]
+- [mon.c, mgr.y, osd.2]
 - [osd.3]
 - [osd.4]
 - [osd.5]
diff --git a/qa/suites/stress/thrash/clusters/3-osd-1-machine.yaml b/qa/suites/stress/thrash/clusters/3-osd-1-machine.yaml
index d8ff594b95de..8c3556ae926b 100644
--- a/qa/suites/stress/thrash/clusters/3-osd-1-machine.yaml
+++ b/qa/suites/stress/thrash/clusters/3-osd-1-machine.yaml
@@ -1,3 +1,3 @@
 roles:
-- [mon.0, mds.a, osd.0, osd.1, osd.2]
-- [mon.1, mon.2, client.0]
+- [mon.a, mgr.x, mds.a, osd.0, osd.1, osd.2]
+- [mon.b, mon.c, client.0]
diff --git a/qa/suites/stress/thrash/clusters/8-osd.yaml b/qa/suites/stress/thrash/clusters/8-osd.yaml
index 3b131054e95e..9f51c6bad781 100644
--- a/qa/suites/stress/thrash/clusters/8-osd.yaml
+++ b/qa/suites/stress/thrash/clusters/8-osd.yaml
@@ -1,7 +1,7 @@
 roles:
-- [mon.0, mds.a, osd.0]
-- [mon.1, osd.1]
-- [mon.2, osd.2]
+- [mon.a, mds.a, osd.0]
+- [mon.b, mgr.x, osd.1]
+- [mon.c, osd.2]
 - [osd.3]
 - [osd.4]
 - [osd.5]
diff --git a/qa/suites/teuthology/buildpackages/tasks/branch.yaml b/qa/suites/teuthology/buildpackages/tasks/branch.yaml
index b93c5d07c4a3..1dad96f3a3a1 100644
--- a/qa/suites/teuthology/buildpackages/tasks/branch.yaml
+++ b/qa/suites/teuthology/buildpackages/tasks/branch.yaml
@@ -1,5 +1,5 @@
 roles:
-    - [mon.0, client.0]
+    - [mon.a, mgr.x, client.0]
 tasks:
     - install:
         # branch has precedence over sha1
diff --git a/qa/suites/teuthology/buildpackages/tasks/tag.yaml b/qa/suites/teuthology/buildpackages/tasks/tag.yaml
index 126749c9bb0b..2bfb8a995db5 100644
--- a/qa/suites/teuthology/buildpackages/tasks/tag.yaml
+++ b/qa/suites/teuthology/buildpackages/tasks/tag.yaml
@@ -1,5 +1,5 @@
 roles:
-    - [mon.0, client.0]
+    - [mon.a, mgr.x, client.0]
 tasks:
     - install:
         # tag has precedence over branch and sha1
diff --git a/qa/suites/teuthology/ceph/clusters/single.yaml b/qa/suites/teuthology/ceph/clusters/single.yaml
index beba3972ce9a..0c6a40d0bdeb 100644
--- a/qa/suites/teuthology/ceph/clusters/single.yaml
+++ b/qa/suites/teuthology/ceph/clusters/single.yaml
@@ -1,2 +1,2 @@
 roles:
-    - [mon.0, client.0]
+    - [mon.a, mgr.x, client.0]
diff --git a/qa/suites/teuthology/multi-cluster/all/ceph.yaml b/qa/suites/teuthology/multi-cluster/all/ceph.yaml
index 6a93b9a9a485..4659ef3d1f4d 100644
--- a/qa/suites/teuthology/multi-cluster/all/ceph.yaml
+++ b/qa/suites/teuthology/multi-cluster/all/ceph.yaml
@@ -1,11 +1,13 @@
 roles:
 - - ceph.mon.a
   - ceph.mon.b
+  - ceph.mgr.x
   - backup.osd.0
   - backup.osd.1
   - backup.osd.2
   - backup.client.0
 - - backup.mon.a
+  - backup.mgr.x
   - ceph.osd.0
   - ceph.osd.1
   - ceph.osd.2
diff --git a/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml b/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml
index c25a2141c190..52002f57f929 100644
--- a/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml
+++ b/qa/suites/teuthology/multi-cluster/all/thrashosds.yaml
@@ -1,6 +1,7 @@
 roles:
 - - backup.mon.a
   - backup.mon.b
+  - backup.mgr.x
   - backup.osd.0
   - backup.osd.1
   - backup.osd.2
diff --git a/qa/suites/teuthology/multi-cluster/all/upgrade.yaml b/qa/suites/teuthology/multi-cluster/all/upgrade.yaml
index c8a742ffefc1..42cd93b2c177 100644
--- a/qa/suites/teuthology/multi-cluster/all/upgrade.yaml
+++ b/qa/suites/teuthology/multi-cluster/all/upgrade.yaml
@@ -8,11 +8,13 @@ overrides:
 roles:
 - - ceph.mon.a
   - ceph.mon.b
+  - ceph.mgr.x
   - backup.osd.0
   - backup.osd.1
   - backup.osd.2
   - backup.client.0
 - - backup.mon.a
+  - backup.mgr.x
   - ceph.osd.0
   - ceph.osd.1
   - ceph.osd.2
diff --git a/qa/suites/teuthology/multi-cluster/all/workunit.yaml b/qa/suites/teuthology/multi-cluster/all/workunit.yaml
index 4c32d9af6a04..b1288e38efbf 100644
--- a/qa/suites/teuthology/multi-cluster/all/workunit.yaml
+++ b/qa/suites/teuthology/multi-cluster/all/workunit.yaml
@@ -1,11 +1,13 @@
 roles:
 - - backup.mon.a
+  - backup.mgr.x
   - osd.0
   - osd.1
   - osd.2
   - client.0
   - backup.client.0
 - - mon.a
+  - mgr.x
   - backup.osd.0
   - backup.osd.1
   - backup.osd.2
diff --git a/qa/suites/teuthology/no-ceph/clusters/single.yaml b/qa/suites/teuthology/no-ceph/clusters/single.yaml
index beba3972ce9a..0c6a40d0bdeb 100644
--- a/qa/suites/teuthology/no-ceph/clusters/single.yaml
+++ b/qa/suites/teuthology/no-ceph/clusters/single.yaml
@@ -1,2 +1,2 @@
 roles:
-    - [mon.0, client.0]
+    - [mon.a, mgr.x, client.0]
diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
index e817dad23737..01580e38f066 100644
--- a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
@@ -1,7 +1,7 @@
 # this runs s3tests against rgw, using civetweb
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
-- [mon.b, osd.3, osd.4, osd.5, client.1]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1]
 
 tasks:
 - install:
diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
index 1f34a7121315..d8a5050385cc 100644
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
@@ -1,7 +1,7 @@
 # this runs s3tests against rgw, using mod_fastcgi
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
-- [mon.b, osd.3, osd.4, osd.5, client.1]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1]
 
 tasks:
 - install:
diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
index 065f6e2b9731..1def7b042bde 100644
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
@@ -2,7 +2,7 @@
 # the choice between uds or tcp with mod_proxy_fcgi depends on the distro
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]
-- [mon.b, osd.3, osd.4, osd.5, client.1]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1]
 
 tasks:
 - install:
diff --git a/qa/suites/tgt/basic/clusters/fixed-3.yaml b/qa/suites/tgt/basic/clusters/fixed-3.yaml
index 0038432afa7d..5e23c9e4f44c 100644
--- a/qa/suites/tgt/basic/clusters/fixed-3.yaml
+++ b/qa/suites/tgt/basic/clusters/fixed-3.yaml
@@ -1,4 +1,4 @@
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5]
+- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
 - [client.0]