upgrade: fix upgrade jewel to luminous for mgr nodes

mgr nodes can't be upgraded from jewel to luminous because ceph-mgr role
is skipped because of the condition `when:
"ceph_release_num[ceph_release] >= ceph_release_num.luminous"`. Indeed,
ceph-mgr package is upgraded in `ceph-mgr` role, therefore,
`ceph_release` is still set to the old version. It means the when can't
be satisfied.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 302e563601cd6820b1ae44fabdfb1506688c7c9b)
pull/2076/head
Guillaume Abrioux 2017-10-19 15:07:58 +02:00 committed by Sébastien Han
parent acbdb7f4fe
commit 70034451e9
1 changed files with 4 additions and 2 deletions

View File

@ -175,10 +175,12 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-config
- { role: ceph-common, when: not containerized_deployment } - { role: ceph-common, when: not containerized_deployment }
- { role: ceph-docker-common, when: containerized_deployment } - { role: ceph-docker-common, when: containerized_deployment }
- { role: ceph-mgr, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" } - ceph-config
- { role: ceph-mgr,
when: "(ceph_release_num[ceph_release] >= ceph_release_num.luminous) or
(ceph_release_num[ceph_release] < ceph_release_num.luminous and rolling_update)" }
post_tasks: post_tasks:
- name: start ceph mgr - name: start ceph mgr