From 0eed858952c197b1dc40a67d07a7e4184fc4e37b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 25 May 2021 21:40:45 +0200 Subject: [PATCH] fs2bs: use match filter in selectattr() 0990ae41099d8b9d678f546fc8790033f421711f 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 (cherry picked from commit d6745e9cd9c2b5f0e20280e4ae0fe1b125287b0c) --- infrastructure-playbooks/filestore-to-bluestore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml index 2651c867e..81a27692d 100644 --- a/infrastructure-playbooks/filestore-to-bluestore.yml +++ b/infrastructure-playbooks/filestore-to-bluestore.yml @@ -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', '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 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', '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 command: >