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>
pull/1945/head
Sébastien Han 2017-09-22 17:26:28 +02:00
parent 1ea3ec1790
commit d5bfc6f85d
18 changed files with 66 additions and 60 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0 monitor_interface=eth1
[osds]
osd0
[mgrs]
mon0
[osds]
osd0

View File

@ -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

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -3,6 +3,9 @@ mon0
mon1
mon2
[mgrs]
mgr0
[osds]
osd0
@ -12,9 +15,6 @@ mds0
[rgws]
rgw0
[mgrs]
mgr0
[nfss]
nfs0

View File

@ -1,5 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0

View File

@ -1,5 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -1,8 +1,8 @@
[mons]
mon0
[mgrs]
mon0
[osds]
osd0
[mgrs]
mon0

View File

@ -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