From 386661699bcfe05a220de6d58b9d50baa7eb6dc1 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 3 Aug 2021 11:58:49 -0400 Subject: [PATCH] infra: use dedicated variables for balancer status MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The balancer status is registered during the cephadm-adopt, rolling_update and swith2container playbooks. But it is also used in the ceph-handler role which is included in those playbooks too. Even if the ceph-handler tasks are skipped for rolling_update and switch2container, the balancer_status variable is erased with the skip task result. play1: register: balancer_status play2: register: balancer_status <-- skipped play3: when: (balancer_status.stdout | from_json)['active'] | bool This leads to issue like: The conditional check '(balancer_status.stdout | from_json)['active'] | bool' failed. The error was: Unexpected templating type error occurred on ({% if (balancer_status.stdout | from_json)['active'] | bool %} True {% else %} False {% endif %}): expected string or buffer. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1982054 Signed-off-by: Dimitri Savineau --- infrastructure-playbooks/cephadm-adopt.yml | 6 +++--- infrastructure-playbooks/rolling_update.yml | 6 +++--- ...from-non-containerized-to-containerized-ceph-daemons.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index b4ebe655f..486b56580 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -453,7 +453,7 @@ - name: get balancer module status command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" - register: balancer_status + register: balancer_status_adopt run_once: true delegate_to: "{{ groups[mon_group_name][0] }}" changed_when: false @@ -470,7 +470,7 @@ run_once: true delegate_to: "{{ groups[mon_group_name][0] }}" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_adopt.stdout | from_json)['active'] | bool - name: disable pg autoscale on pools ceph_pool: @@ -633,7 +633,7 @@ run_once: true delegate_to: "{{ groups[mon_group_name][0] }}" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_adopt.stdout | from_json)['active'] | bool - name: redeploy mds daemons hosts: "{{ mds_group_name|default('mdss') }}" diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 6c248bd20..154abdf8c 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -418,7 +418,7 @@ - name: get balancer module status command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" - register: balancer_status + register: balancer_status_update changed_when: false check_mode: false @@ -430,7 +430,7 @@ - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_update.stdout | from_json)['active'] | bool - name: disable pg autoscale on pools ceph_pool: @@ -575,7 +575,7 @@ - name: re-enable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_update.stdout | from_json)['active'] | bool - name: upgrade ceph mdss cluster, deactivate all rank > 0 hosts: "{{ mon_group_name | default('mons') }}[0]" diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 2b4b289e3..e43647216 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -223,7 +223,7 @@ - name: get balancer module status command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" - register: balancer_status + register: balancer_status_switch changed_when: false check_mode: false @@ -235,7 +235,7 @@ - name: disable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_switch.stdout | from_json)['active'] | bool - name: disable pg autoscale on pools ceph_pool: @@ -429,7 +429,7 @@ - name: re-enable balancer command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" changed_when: false - when: (balancer_status.stdout | from_json)['active'] | bool + when: (balancer_status_switch.stdout | from_json)['active'] | bool - name: switching from non-containerized to containerized ceph mds -- 2.39.5