mgr: always bootstrap mgr right after the mon

If we don't bootstrap the mgr after the mon and the osds handler are
called, we will never be able to reach a clean state since the pgs
stats are handled by the mgr. This also happens when doing daemon
collocation.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493920
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index f39988c50907d6353786ae39fa5167c3d8188903..f01b29372936e97535fda316d8a4b4cb9fe58a2f 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -33,6 +33,15 @@
     - ceph-mon
   serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS
 
+- hosts: mgrs
+  become: True
+  gather_facts: false
+  roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+
 - hosts: osds
   become: True
   gather_facts: false
@@ -87,15 +96,6 @@
     - ceph-config
     - ceph-restapi
 
-- hosts: mgrs
-  become: True
-  gather_facts: false
-  roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-
 - hosts: clients
   become: True
   gather_facts: false

diff --git a/site.yml.sample b/site.yml.sample
index 113e9bb037c000c9025d0bf3368c8c1c12e1f012..2e46bbacbe8331994ceb8485d2a15f10b017a7b8 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -61,6 +61,15 @@
     - ceph-config
     - ceph-mon
 
+- hosts: mgrs
+  gather_facts: false
+  become: True
+  roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+
 - hosts: agents
   gather_facts: false
   become: True
@@ -133,15 +142,6 @@
     - ceph-config
     - ceph-client
 
-- hosts: mgrs
-  gather_facts: false
-  become: True
-  roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-
 - hosts: iscsi_gws
   gather_facts: false
   become: True

diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts
index ea51342dd59a79e6b175fb3202c0567293c32213..50264e22638e6522e5ec92da7a9d39cfd9af005a 100644 (file)
--- a/tests/functional/centos/7/bluestore/hosts
+++ b/tests/functional/centos/7/bluestore/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.1.10
 mon1 monitor_interface=eth1
 mon2 monitor_address=192.168.1.12
 
+[mgrs]
+mon0
+
 [osds]
 osd0
 
@@ -14,6 +17,3 @@ rgw0
 
 [clients]
 client0
-
-[mgrs]
-mon0

diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
+++ b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-crypt-jrn-col/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/bs-crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/bs-crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/hosts b/tests/functional/centos/7/bs-dock-ded-jrn/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/bs-dock-ded-jrn/hosts
+++ b/tests/functional/centos/7/bs-dock-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/bs-jrn-col/hosts b/tests/functional/centos/7/bs-jrn-col/hosts
index 6085b1d2f28d548c4e884766f768236d249b5b49..9bafa880c69ebf524659660390153c6d6fa2be82 100644 (file)
--- a/tests/functional/centos/7/bs-jrn-col/hosts
+++ b/tests/functional/centos/7/bs-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0 monitor_interface=eth1
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 0586396469009bb0372f6924e452b02a09f3e86c..bddde7c58fe0f0c0291a8a03c3c2ac05a1456482 100644 (file)
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -3,6 +3,9 @@ ceph-mon0 monitor_address=192.168.1.10
 ceph-mon1 monitor_interface=eth1
 ceph-mon2 monitor_address=192.168.1.12
 
+[mgrs]
+ceph-mgr0
+
 [osds]
 ceph-osd0
 
@@ -15,9 +18,6 @@ ceph-rgw0
 [clients]
 ceph-client0
 
-[mgrs]
-ceph-mgr0
-
 [nfss]
 ceph-nfs0
 

diff --git a/tests/functional/centos/7/crypt-ded-jrn/hosts b/tests/functional/centos/7/crypt-ded-jrn/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/crypt-ded-jrn/hosts
+++ b/tests/functional/centos/7/crypt-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/crypt-jrn-col/hosts b/tests/functional/centos/7/crypt-jrn-col/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/hosts b/tests/functional/centos/7/docker-crypt-jrn-col/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/docker-crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/docker-crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/docker-ded-jrn/hosts b/tests/functional/centos/7/docker-ded-jrn/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/docker-ded-jrn/hosts
+++ b/tests/functional/centos/7/docker-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
index 7e0ab98a134df4a3e1f44cc6b4642b4e2eab6c78..4696f238f02b979020809d293a168dd31273ace6 100644 (file)
--- a/tests/functional/centos/7/docker/hosts
+++ b/tests/functional/centos/7/docker/hosts
@@ -3,6 +3,9 @@ mon0
 mon1
 mon2
 
+[mgrs]
+mgr0
+
 [osds]
 osd0
 
@@ -12,9 +15,6 @@ mds0
 [rgws]
 rgw0
 
-[mgrs]
-mgr0
-
 [nfss]
 nfs0
 

diff --git a/tests/functional/centos/7/jrn-col-auto-dm/hosts b/tests/functional/centos/7/jrn-col-auto-dm/hosts
index f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/jrn-col-auto-dm/hosts
+++ b/tests/functional/centos/7/jrn-col-auto-dm/hosts
@@ -1,5 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0

diff --git a/tests/functional/centos/7/jrn-col-auto/hosts b/tests/functional/centos/7/jrn-col-auto/hosts
index f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/jrn-col-auto/hosts
+++ b/tests/functional/centos/7/jrn-col-auto/hosts
@@ -1,5 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0

diff --git a/tests/functional/centos/7/jrn-col/hosts b/tests/functional/centos/7/jrn-col/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/jrn-col/hosts
+++ b/tests/functional/centos/7/jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/lvm-osds/hosts b/tests/functional/centos/7/lvm-osds/hosts
index e1c1de6f821a2c6348b7923232a2e12d3e768231..d6c89012a9db9c79663024d925b78041bbab1a99 100644 (file)
--- a/tests/functional/centos/7/lvm-osds/hosts
+++ b/tests/functional/centos/7/lvm-osds/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0

diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
index e42554e9b728863b26988c8b2ff7087236a5c8b4..98355f3b8585b5b3bcadb197583c88dba1c290b0 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/hosts
+++ b/tests/functional/ubuntu/16.04/cluster/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.5.10
 mon1 monitor_address=192.168.5.11
 mon2 monitor_address=192.168.5.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0
 
@@ -15,8 +18,5 @@ rgw0
 [clients]
 client0
 
-[mgrs]
-mgr0
-
 [nfss]
 nfs0