From 858048560e974a78db7d46a9afaebd6ae1a83c55 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 18 Feb 2021 20:50:16 +0100 Subject: [PATCH] update: fix require-osd-release task This commit fixes two issues in rolling_update.yml: - `container_exec_cmd_update_osd` is unset in the `complete osd upgrade` play so it never runs the command in a container. - the 'require-osd-release' task is never applied because the condition looks for luminous release. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1930164 Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/rolling_update.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 7784124f6..a739432df 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -469,6 +469,11 @@ - noout - nodeep-scrub + - name: set_fact container_exec_cmd_osd + set_fact: + container_exec_cmd_update_osd: "{{ container_binary }} exec ceph-mon-{{ ansible_hostname }}" + when: containerized_deployment | bool + - name: get osd versions command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} versions" register: ceph_versions @@ -481,10 +486,10 @@ # length == 1 means there is a single osds versions entry # thus all the osds are running the same version - name: complete osds upgrade - command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} osd require-osd-release luminous" + command: "{{ container_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} osd require-osd-release nautilus" when: - (ceph_versions.get('stdout', '{}')|from_json).get('osd', {}) | length == 1 - - ceph_versions_osd | string is search("ceph version 12") + - ceph_versions_osd | string is search("ceph version 14") - name: upgrade ceph mdss cluster, deactivate all rank > 0