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 c655b90c81cdbebbfb34b85129f3f94f3bfe7d0b..ff35ed1a65b4d47d44a670f504010b968d88f84a 100644 (file)
--- 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 ed554c9fe3c7eef1001b702a41558aaa705784f2..c1228b3a1c7f6814946afb81e4a30f39accbc0c6 100644 (file)
--- 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 bc120ad0b29fb5fcab02415476fb0c84b8cb6dc1..5f4773fc5ae832cbb372ff29ba3c38ebcd3e1068 100644 (file)
--- 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 349439cb331bb8f9d0e28c9e9347f1ae665335ca..2b495374f3d3d785e3bca82ee30a5b2a4e81db2e 100644 (file)
--- 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 3768607330822f68ec1134f3caf87a984f6d4879..38725b086428465ee5693585572acf303e0164a0 100644 (file)
--- 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 861e50919315650b73ab6c7d0f07007a20a28a04..6886d1701b8a90c308a66c367f504fd30113aed7 100644 (file)
--- 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 499c84c37180bc449eb8cabeb5aabcca15a840eb..7e2e5f05c7651f9a2fcbeefb69eee3db7aca03bf 100644 (file)
--- 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 8e622d2db946435a883e9a8559dc7b4824e0309e..3ed30b94ff082b1088ea5e82fd9a1b8f091fe7aa 100644 (file)
--- 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 7f051dc1fed4218ee4be0e74f05613a62ccd6ceb..86eb2c63439ea396b3319cddde019035b2d90838 100644 (file)
--- 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 102a45289245ae7de239e8c168fc84638dff5e00..f2d374dd98a622f769e6325228a312c61e6cbff9 100644 (file)
--- 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 66a5726d12ba81b779faff74e98132c40b859601..332b94407285fe756d8cc3b34a2ef9c015704a81 100644 (file)
--- 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 18197ad8571ace888916356e1e15eb24a4ee60e2..fd8c2174118e7672019f72b5feb3dce1afc5fd7a 100644 (file)
--- 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 48b66dd5ca35ec588bd660198d5d2380f17a3e3c..ecded01b4ff992322db6da992f16a39e5d164f18 100644 (file)
--- 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 b5a79906c690eeb3c081c8052835310918334219..d0aecd00875f6d73ce4d6748767c2047faee84e5 100644 (file)
--- 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 c67a5cb63b9d672b68043df6bf05e30e5d922e72..0b4b6b157138a15b591d189f6d9e6a9c3c718e01 100644 (file)
--- 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 0d651ca7641d2d957e2dc65733ba18104bb99e2d..fc4873ceed1a1ed9e9c0b66d35034649d72f037b 100644 (file)
--- 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 b7655a2fc541d48991838ae01fd1db41467fea1f..98adab33e57701635f8582ccf7db0efc20f73d3a 100644 (file)
--- 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 e027e553395c5a13911a2226203ada85508ee5e8..0f00ffc887025a4c59a3fa3f306d625310bb2a36 100644 (file)
--- 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 17cfd7b3d793f17eae45c990ed7211a034272e16..d4bb14143d3ef886ea3f7321ede89b415ceaf970 100644 (file)
--- 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 1fc1b4454404e5dff1a49d25b56f5a5c55d1d699..78b912f725283ae418b202d3d228121dffa87645 100644 (file)
--- 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 e6d82601cfdc1863637cb8b9e8a065ca8c785dfd..9586e6c8ffd381d7a9dbb1d8c728bec008b78cb9 100644 (file)
--- 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 b5ff712cb4723bebc04bdd1d7651ee7ef6f9f369..52c5d7e0171ae86a81dc489699e9efca927d2c20 100644 (file)
--- 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 6b5e23b6c1f7c12359cba5367f8daadac4ed38dd..f9e423e2fc3cc4c3e02db97e42297b5bcfa7ed31 100644 (file)
--- 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 ba2442b27ca70ff59074f86f621d842aad7ec55e..a4bafed29a4a1c9194d19838eec6c9b22a236b06 100644 (file)
--- 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 cceea69e2636b8650bb8dcde88b485f697ddc2c6..d02524866c3f7af7d59b1899459a24eff1cd1f8c 100644 (file)
--- 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 52efc6930743a825cad266cb29efd0f0c22a9add..6fc0af68f4b623302595b45576e68c82c50181a9 100644 (file)
--- 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 26e029d0dbe3dd78a67add309ce92281a9e16bac..90b6cf626c8a0a2b0221987af438150309a29508 100644 (file)
--- 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 7bb4e3255beb3225e5f82e7b4ec079313b82ebc4..1d432addb4af25d2acb4ad23e409d0faeab06afc 100644 (file)
--- 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 237a4947f2a81d09371b254aa84d61dba19255f2..d27054a848227e8985d741d8f9cabd2168dc1411 100644 (file)
--- 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 a2184eefc5d1a0e3f973ce6ecd2e1b8a3696c8a3..be13431890f79cde9081dbf7cc4b590e627989ea 100644 (file)
--- 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 0038432afa7dca757dcb9ced966aa954d4d7d283..5e23c9e4f44c87b14d470e45c2fdbb9eaf16bdf1 100644 (file)
--- 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 2258befd8bf965459b0ad6275d50af9ca0794dd1..19d312dce5796310dbe68029f56df80476a12b14 100644 (file)
--- 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 9e11c02a36c159cd0b7912bec60b5979fd70475b..45c3e80e57d819e5b178c8fadf446019ef3ace2a 100644 (file)
--- 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 088d9f0d31d2043f1739ed4a8989ca5085973622..2995ea9f358cc2bdcd8569a7ea82cd7863fa4408 100644 (file)
--- 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 be824f0f5542f91f4c6e1949e91c9483fa57dc2b..083a07c25e109e7a178f2a26365adeeb8a5adc05 100644 (file)
--- 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 e1d3c7b7932b6a15505b388f8c4c33df90a03e04..134bca1b9a31e3e3b333917087005b048fe704e8 100644 (file)
--- 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 acf5deeee8fa47b1c1a944fdfa70031278af387c..1a415ef249e777ac303f64ec7a0f1967e5ca1147 100644 (file)
--- 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 c51bc16dffd4f66ccaf37010715cb55292e1ce74..4a8334c66a2d13925f9d3c080eb2bbd5a0fad78b 100644 (file)
--- 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 d5503a40c863570c3bbea9714a92540ed519e9ef..8ba3c691e1abdbec1ad794e5e9aa0a43612c6dd8 100644 (file)
--- 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 b3a2caf7212e2bccc60ea525ccb61016a7c85695..4b721ef80c76a4f0ad17b0d11ce4fa4f49b6da1c 100644 (file)
--- 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 54332118434377edf3964179cf9526eff440cef8..a2874c1d0e5da3a77819aa150b5b8fdbe440a300 100644 (file)
--- 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 646ff15d45e4f44818d341c0f9c3235886434690..b6d04a022d809429d48ab0d5adc65481461f8a23 100644 (file)
--- 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 e663324b5d61c958f89bf05bbe2299009843260e..7b8c62645dddb7a7e23e51c631bddd3f826aad08 100644 (file)
--- 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 b16e3267c06fa57ff65af069482ddb299ef6fab2..715cbe855ae367828bace35249b5aed327de0c97 100644 (file)
--- 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 c2c7b494ed800d1f014dcc75529217cfcc6fd0d7..d029c4c594daf3987562f52bcdacb1f1053c91b9 100644 (file)
--- 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 cc608663c546690556ac9a6b3a34967803e44fbd..d40143c17a78e6341a188059b4fc7d86d0d4922e 100644 (file)
--- 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 e062459c6917351fc9d175a01e646e3036d2f5ef..215d0f08f9b6b0711aa950a668446505ece6a537 100644 (file)
--- 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 7e401d168f5e397f7b0b6d1e8c7921519cbeb588..b0af80084f8c8b199d128c07025d423f7ac8b2fb 100644 (file)
--- 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 53a93f67f4493c766984e8ce9db9b7bdaf83a928..58b5197d61b45f5332e0f012451756a91c12b355 100644 (file)
--- 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 64dd3a7352d36a898473d8a3d1a93881926c1f00..2d3f3c69212d025ec69407ae3d46be3b6e9109ab 100644 (file)
--- 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 78f61c2ad4cccc039f20919f72d7533d2438eeb7..1c34fcaea2df18c90992338ab3d72c63557c62ba 100644 (file)
--- 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 6921c5d572e98e9357564b0ef96234a5c247fd8f..efff8d379306b848882ad3cd11b43ee3798a52d5 100644 (file)
--- 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 386d12c098e3dcdd89d54c32007019c4ae656130..e407a391807d5901d88d54d000eeaee2e2d3d5e9 100644 (file)
--- 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 910e374ece9a0c59ca159eb5ba2fdcd125438a2d..b5442342b1872ca808b91b296a4625c6b60e32fa 100644 (file)
--- 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 8cd36b8342e2ef2c4b9bb84c95cf9d21537517bf..5009ee617035c8384408160e2fc0a0fd2179bacd 100644 (file)
--- 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 d0a4db067cf076d882cdacfb60b161df17dca66b..8634362339f7f8652d026d793218bf5f0992b9d7 100644 (file)
--- 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 4a9de25e18077cc22309987e53508dc11b8f96ff..e0badd4d3afad51ef57f4a2f17005ea39faa85d4 100644 (file)
--- 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 6b46bc5bf3b2bcaf53a030d982763f0f72ee2536..e21086a6be8361075eb028f319c169ba76e08e62 100644 (file)
--- 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 1f9a695adab0d41df224101203dfe6130c743619..98b509526e6b9fa1f5ef232faeab62c300b2cea2 100644 (file)
--- 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 78f6e96c9db72f11418c4fcde836e09590b04e14..0afc444a7c46e3822ffc686ab7f330ffec6ba1c5 100644 (file)
--- 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 776a6a921dd1b985e1b531b3945a61b731a8b109..c05ad133be36aa99970f33594e043437f797c1f3 100644 (file)
--- 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 5a61e21e90c25b480b1369eed7d851ca5d35c4b6..afbe9702e5856e3947a11be9db1cad93036cce8d 100644 (file)
--- 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 b0a886339a88952e5970ad08dac463af8f99916f..55f8822f2b1012f215b215a97949a73a67b8c222 100644 (file)
--- 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 3103703edf4ecc2dc1ef0ef5f58b6ac595e138ff..bb7c2b57f50f89594ada345cad9d547e3762a483 100644 (file)
--- 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 dd00b87003abec5dbd724bfacb1b34280e6a4720..ab749f1b516ec723768525cfeb2c148de3212478 100644 (file)
--- 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 f153de6295468480cb6f2d3b77544fed5b2ad619..7d3b443021bbb9988bfa41e0ffad385aae0f4093 100644 (file)
--- 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 7c4b5f0e03984b0f5ddc1c8a5311d76420354c8c..6ceefe1222e351dd3743196dfb889a5d7d9c8b23 100644 (file)
--- 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 fbc24e0d17e7c8b40430e7de91e748d6d188d271..15f4710bd9bf41eee2e609c68bad54cced593fd4 100644 (file)
--- 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 31649dbb0da82e92f5b5da2395e8ecc2cf17cc28..3f22ba3c0136a436445126715aada2f877decb00 100644 (file)
--- 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 b905691a9f4cae29f5a5d86431367a99b5f5ec47..7bb4f65030edc05058d76e0b3cd44a19133cde45 100644 (file)
--- 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 a5cd937791b0520efbec8c26f0207b92590171e2..ccd980fded7bbe6c29208c4f56ded5926cf7ba73 100644 (file)
--- 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 5cadddabe6bec3000f00897a93136eaefc55994b..1b4622998f9ba623486e034060fd049686f60c5d 100644 (file)
--- 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 c9263db00ec517d24a87b0292957c230f5515c84..f84a0df8d6600dda971209447e719c72049ff6c2 100644 (file)
--- 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 c7f053c40f3b4b197cd1d99243a9c80039bb6480..773cb2480a6fe31641e6963abc25a46cf20ed587 100644 (file)
--- 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 c86dc872067e7a80680e8a9dec5753441bcbac7f..214d7f20cc74c322587016208e311e7262beb19c 100644 (file)
--- 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 9eaaa946e83b66262da7cdd4c79abee461b37566..6e22b44563e9dc0f82e247eac319ca4987caa3db 100644 (file)
--- 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 552ed26c28be65f2f43e07e045a2e2034800b18d..f7e61c962633fb3f349be33d02e9b899fb81d969 100644 (file)
--- 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 1df407949705933d2bc572d653f1f7c6cdf2b212..8bc9dbdcd0f06dbe8d82c29af89b2224c855544b 100644 (file)
--- 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 5ce1cd0a89317ccaf88e5d32ea72608893ef13e4..c3be13ae6a2cff68fcf7c82a4aa510f93538b68d 100644 (file)
--- 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 8bc502a14561a9f1591d4d1ba9288a867842fa04..5521a27f04f15c2bb74d887858480c7d26176ad7 100644 (file)
--- 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 278ff1aa5ba91282afead6a6be86338b98b5f855..c64593212a5f2789e6106085ea82d652766eab9f 100644 (file)
--- 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 ce39a6b2cd4f27a63d4d48b6ec7a3d0403f47ae8..cbd90e4097da0267df52976b788505efe6e5592a 100644 (file)
--- 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 65c875a9a1988978449a5fd3fce4beece7bba52f..0835d22bfa6c9b7d56079b1eb87977b97f6c90d8 100644 (file)
--- 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 af963106a2a2a1f7dec28ff885fa13e131e0e72b..49e3e8799c143fd2382bb42d89a8814e07f36270 100644 (file)
--- 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 02c228d779313c4d82dda807afe3787c933f123d..1875da409a25e77704ae37ba0b1d262795dbf2e4 100644 (file)
--- 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 48900f392dfa0b6650267543c73fbc9a4372404c..ad1fd17d5f589887b0443b2925e06ee7136b2204 100644 (file)
--- 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 11317e6ee74db2a22f020019c3dc295fb029c5f7..db86583f22c887f22c8b68cb06e71dec1dafda7f 100644 (file)
--- 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 fd200d752a26254989fa66298a68e4a5b86dbb80..2872225e9934362e3f55fd9c8f40b5caca5147fd 100644 (file)
--- 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 e88b12b1381acbaafde5fc4e168ad6e7394e7bf2..8eb30c45e6f2c2ae86c32d086e11493db38557f1 100644 (file)
--- 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 455de4f98311ec871733f216363a401726bbc453..182589152d21794ae7c1d691bb5fa074a2752b60 100644 (file)
--- 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 93be2fce61a50386cc3357bf9c25f412c26ca6b1..473c205411f25b69fefb54a8ca576ee645c40781 100644 (file)
--- 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 6394cc7ef00c70cd0e4f7df5bd7844c40bd0be40..22dbd8c0334819cbe74243d775bb139533e99465 100644 (file)
--- 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 8bed75c18894b6c33ef260e9db74d543c8c364d1..f6a19910c12b18ac72b02369031c9c5bba4a5494 100644 (file)
--- 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 76a999db8f311669623ff77e69e5c00b70ba7433..31b269d63093367487ee4f466080cf1255408800 100644 (file)
--- 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 bb7e12b79687096be27082aa7c80dcc44a490dcb..c00a5c9b8fb89cd8b609be7b81936b1809d535f9 100644 (file)
--- 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 bf67dbab3d11c28e21a88d0e304bcab93a40b60b..bfb203904189c38509c9ed755ba991b16540ef4d 100644 (file)
--- 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 823e67202c318da88e982796ead3ec4e7fb69ebd..bf1b4befe032d754519994180688c0be78eb486b 100644 (file)
--- 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 64667d9df29f4c1473a218da4b2e61d68da814b3..908a678040394cba09eb934b211af45e9a0d8da0 100644 (file)
--- 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 434575d382d4247807be9524a18453efb5d920c7..f14bd7431b2f9a834874c7332a3004d62adb4ec6 100644 (file)
--- 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 9caf64464ad7983dace091018f74005c557c67d4..21624164beba5fd444b08c9de97f167c8fe33575 100644 (file)
--- 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 a28875cc5631942445f531f9dede6dddf025bdbb..cf602cbb154e78abfb4748c349c5e9397be1c1ba 100644 (file)
--- 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 4f2bd19a92e1059291e2b20fc254ad8ac6a4bc42..e763bcc34e9c5d51cd183904fa5fd3f99f7a6b31 100644 (file)
--- 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 543a84958de7badad28e4b9e098e2b069e0b23a5..fc499d495068026cb0761e59039c0c886673a572 100644 (file)
--- 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 92b110277edf2d985fed09e8298857b3df83c053..5ab06f74944b0c841a5d84bf62d6e574dcbb6674 100644 (file)
--- 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 1adc95390aea45b7568310dae883a6dc908a8c2e..bf7f5aa3a5e7de20778f727bedd51cbabe72ce64 100644 (file)
--- 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 4885bf78203322eb27b600d81bfbca55d260d9cc..03d7c612c4a37c77157ed4e281eeaf332576093f 100644 (file)
--- 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 93b75517898555a25d1069ddb73f5da8c7e63c5f..d28dec9e7a12c9542aadc8c4ee8b331037ab126b 100644 (file)
--- 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 ccdafad206935a46bd9a44271c58225b80167f25..aada29b5b33466bd6fedcc1f376c032694274199 100644 (file)
--- 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 5da11351a20783185c997ae467a1b44fc4878f21..8e81240e25ae197240a267cb777e93c6e11cfaab 100644 (file)
--- 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 86c71b81daf496a85b41201c240724e3438aa2f7..af432f61038ee1afb49805ab066b6061cb797da3 100644 (file)
--- 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 8e5a98742057f3ec8072ca07a018eb191125081f..43b4de755cb8ff3a1cb99cc67a85d65e65eefdf5 100644 (file)
--- 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 373dd4052c3601f8d925a86558facfc9fc8cda02..76232339bcfbaee437bce46bd56f7a2043622988 100644 (file)
--- 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 d8ff594b95de48264bf54baf7ccd85b6a5924f0e..8c3556ae926b8df96862512320d0b891b0fee81c 100644 (file)
--- 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 3b131054e95e7b180e7a6c77a3220a77a08d8ade..9f51c6bad781d192754eee84b999d00ecb6943b1 100644 (file)
--- 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 b93c5d07c4a32365966776fccfac06930b8119f8..1dad96f3a3a12d773cc21c3cf4cf4ea8d7c71d84 100644 (file)
--- 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 126749c9bb0be9eb89ee1f40009edc21c76826d8..2bfb8a995db53854ccb3a9fafdc963d7f666d1b5 100644 (file)
--- 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 beba3972ce9a952110b59f3f8b972b746bbb9436..0c6a40d0bdeb9db19fa61d49bb3cbfe042994808 100644 (file)
--- 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 6a93b9a9a48581b66fa45168eeca903f74a40c6f..4659ef3d1f4da8ae08f689cf3d46e8418741224b 100644 (file)
--- 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 c25a2141c190b9d467fb1574318fb52377d0a019..52002f57f929b7d656c5167f3f7b6be3d7d8d83e 100644 (file)
--- 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 c8a742ffefc1b027517f0bc4536bfad7e7e4a684..42cd93b2c17790678bfecb1c254adda309c781e8 100644 (file)
--- 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 4c32d9af6a044962147d4b1df87dbc88668a8d90..b1288e38efbf31cb3502655e631b732132779666 100644 (file)
--- 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 beba3972ce9a952110b59f3f8b972b746bbb9436..0c6a40d0bdeb9db19fa61d49bb3cbfe042994808 100644 (file)
--- 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 e817dad237371308a607cdf867b2eab91fc7fa75..01580e38f066021eec6cfcc2d52993981c0b9579 100644 (file)
--- 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 1f34a7121315fa760af1331a5b813fa67f18feed..d8a5050385cce3b2ee7e9f43fd51d995859fd5e9 100644 (file)
--- 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 065f6e2b973113a9a35174894834f0e3ad8bac78..1def7b042bde9ba6a51e52c9e201f81420a73729 100644 (file)
--- 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 0038432afa7dca757dcb9ced966aa954d4d7d283..5e23c9e4f44c87b14d470e45c2fdbb9eaf16bdf1 100644 (file)
--- 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]