From: Guillaume Abrioux Date: Thu, 19 Oct 2017 13:07:58 +0000 (+0200) Subject: upgrade: fix upgrade jewel to luminous for mgr nodes X-Git-Tag: beta-3.1.0~96^2~4 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70034451e98e630605bcc618dfebd8629a97af9a;p=ceph-ansible.git 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 (cherry picked from commit 302e563601cd6820b1ae44fabdfb1506688c7c9b) --- diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 1a767f2ff..5677e45d2 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -175,10 +175,12 @@ roles: - ceph-defaults - - ceph-config - { role: ceph-common, when: not 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: - name: start ceph mgr