From 2b9edba13149cdf326cbe944defbd7e05e328497 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 20 Apr 2020 09:47:31 -0400 Subject: [PATCH] filestore-to-bluestore: fix py2 on skipped tasks When using skipped variables with from_json filter and python2 then we need to have a default value otherwise the skipped task will fail. Unexpected templating type error occurred on ({{ (ceph_volume_lvm_list.stdout | from_json) }}): expected string or buffer Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1790472 Signed-off-by: Dimitri Savineau --- infrastructure-playbooks/filestore-to-bluestore.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml index ffd5eb7f6..170158e02 100644 --- a/infrastructure-playbooks/filestore-to-bluestore.yml +++ b/infrastructure-playbooks/filestore-to-bluestore.yml @@ -161,13 +161,13 @@ - name: set_fact _lvm_list set_fact: _lvm_list: "{{ _lvm_list | default([]) + item.value }}" - with_dict: "{{ (ceph_volume_lvm_list.stdout | from_json) }}" + with_dict: "{{ (ceph_volume_lvm_list.stdout | default('{}') | from_json) }}" - name: ceph-volume prepared OSDs related tasks block: - name: mark out osds command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd out {{ item }}" - with_items: "{{ (ceph_volume_lvm_list.stdout | from_json).keys() | list }}" + with_items: "{{ (ceph_volume_lvm_list.stdout | default('{}') | from_json).keys() | list }}" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true @@ -176,7 +176,7 @@ name: "ceph-osd@{{ item }}" state: stopped enabled: no - with_items: "{{ (ceph_volume_lvm_list.stdout | from_json).keys() | list }}" + with_items: "{{ (ceph_volume_lvm_list.stdout | default('{}') | from_json).keys() | list }}" - name: stop and disable ceph-volume services service: @@ -190,7 +190,7 @@ - name: mark down osds command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd down {{ item }}" - with_items: "{{ (ceph_volume_lvm_list.stdout | from_json).keys() | list }}" + with_items: "{{ (ceph_volume_lvm_list.stdout | default('{}') | from_json).keys() | list }}" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true @@ -257,7 +257,7 @@ set_fact: osd_ids: "{{ osd_ids | default([]) + [item] }}" with_items: - - "{{ ((osd_tree.stdout | from_json).nodes | selectattr('name', 'match', inventory_hostname) | map(attribute='children') | list) }}" + - "{{ ((osd_tree.stdout | default('{}') | from_json).nodes | selectattr('name', 'match', inventory_hostname) | map(attribute='children') | list) }}" - name: purge osd(s) from the cluster