mirror of https://github.com/ceph/ceph-ansible.git
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 <dsavinea@redhat.com>pull/5307/head
parent
eb71244bfd
commit
2b9edba131
|
@ -161,13 +161,13 @@
|
||||||
- name: set_fact _lvm_list
|
- name: set_fact _lvm_list
|
||||||
set_fact:
|
set_fact:
|
||||||
_lvm_list: "{{ _lvm_list | default([]) + item.value }}"
|
_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
|
- name: ceph-volume prepared OSDs related tasks
|
||||||
block:
|
block:
|
||||||
- name: mark out osds
|
- name: mark out osds
|
||||||
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd out {{ item }}"
|
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] }}"
|
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||||
run_once: true
|
run_once: true
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@
|
||||||
name: "ceph-osd@{{ item }}"
|
name: "ceph-osd@{{ item }}"
|
||||||
state: stopped
|
state: stopped
|
||||||
enabled: no
|
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
|
- name: stop and disable ceph-volume services
|
||||||
service:
|
service:
|
||||||
|
@ -190,7 +190,7 @@
|
||||||
|
|
||||||
- name: mark down osds
|
- name: mark down osds
|
||||||
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd down {{ item }}"
|
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] }}"
|
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||||
run_once: true
|
run_once: true
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
osd_ids: "{{ osd_ids | default([]) + [item] }}"
|
osd_ids: "{{ osd_ids | default([]) + [item] }}"
|
||||||
with_items:
|
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
|
- name: purge osd(s) from the cluster
|
||||||
|
|
Loading…
Reference in New Issue