mirror of https://github.com/ceph/ceph-ansible.git
fs2bs: fix wrong filter when setting osd_ids
using 'match' filter in that task will lead to bad behavior if I have
the following node names for instance:
- node1
- node11
- node111
with `selectattr('name', 'match', inventory_hostname)` it will match
'node1' along with 'node11' and 'node111'.
using 'equalto' filter will make sure we only match the target node.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1963066
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0990ae4109
)
pull/6561/head
parent
a27761855b
commit
abebf9b23e
|
@ -49,7 +49,7 @@
|
|||
set_fact:
|
||||
osd_ids: "{{ osd_ids | default([]) | union(item) }}"
|
||||
with_items:
|
||||
- "{{ ((osd_tree.stdout | default('{}') | trim | from_json).nodes | selectattr('name', 'match', '^' + inventory_hostname + '$') | map(attribute='children') | list) }}"
|
||||
- "{{ ((osd_tree.stdout | default('{}') | trim | from_json).nodes | selectattr('name', 'equalto', inventory_hostname) | map(attribute='children') | list) }}"
|
||||
|
||||
- name: get osd metadata
|
||||
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} osd metadata osd.{{ item }} -f json"
|
||||
|
@ -310,7 +310,7 @@
|
|||
set_fact:
|
||||
osd_ids: "{{ osd_ids | default([]) + [item] }}"
|
||||
with_items:
|
||||
- "{{ ((osd_tree.stdout | default('{}') | from_json).nodes | selectattr('name', 'match', inventory_hostname) | map(attribute='children') | list) }}"
|
||||
- "{{ ((osd_tree.stdout | default('{}') | from_json).nodes | selectattr('name', 'equalto', inventory_hostname) | map(attribute='children') | list) }}"
|
||||
|
||||
- name: purge osd(s) from the cluster
|
||||
command: >
|
||||
|
|
Loading…
Reference in New Issue