mirror of https://github.com/ceph/ceph-ansible.git
fs2bs: use match filter in selectattr()
pull/6561/head0990ae4109
changed the filter in selectattr() from 'match' to 'equalto' but due to an incompatibility with the Jinja2 version for python 2.7 on el7 we must stick to using 'match' filter. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commitd6745e9cd9
)
parent
abebf9b23e
commit
0eed858952
|
@ -49,7 +49,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
osd_ids: "{{ osd_ids | default([]) | union(item) }}"
|
osd_ids: "{{ osd_ids | default([]) | union(item) }}"
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ ((osd_tree.stdout | default('{}') | trim | from_json).nodes | selectattr('name', 'equalto', inventory_hostname) | map(attribute='children') | list) }}"
|
- "{{ ((osd_tree.stdout | default('{}') | trim | from_json).nodes | selectattr('name', 'match', '^' + inventory_hostname + '$') | map(attribute='children') | list) }}"
|
||||||
|
|
||||||
- name: get osd metadata
|
- name: get osd metadata
|
||||||
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd metadata osd.{{ item }} -f json"
|
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd metadata osd.{{ item }} -f json"
|
||||||
|
@ -310,7 +310,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
osd_ids: "{{ osd_ids | default([]) + [item] }}"
|
osd_ids: "{{ osd_ids | default([]) + [item] }}"
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ ((osd_tree.stdout | default('{}') | from_json).nodes | selectattr('name', 'equalto', 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
|
||||||
command: >
|
command: >
|
||||||
|
|
Loading…
Reference in New Issue