From 823583a7ff93a352805d19660af8843746e80a38 Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Sat, 15 Jan 2022 20:04:03 +0330 Subject: [PATCH] ceph-facts: ignore mounted disks on osd auto discovery Ignore disks with active mountpoint when osd_auto_discovery is true Signed-off-by: Seena Fallah (cherry picked from commit 9d87fd87cb1af68d8af21bf20bb3acadc80f587b) --- roles/ceph-facts/tasks/devices.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/ceph-facts/tasks/devices.yml b/roles/ceph-facts/tasks/devices.yml index ad8233a90..6c4af65ec 100644 --- a/roles/ceph-facts/tasks/devices.yml +++ b/roles/ceph-facts/tasks/devices.yml @@ -75,8 +75,10 @@ - not osd_auto_discovery | default(False) | bool - name: set_fact devices generate device list when osd_auto_discovery + vars: + device: "{{ item.key | regex_replace('^', '/dev/') }}" set_fact: - devices: "{{ (devices | default([]) + [ item.key | regex_replace('^', '/dev/') ]) | unique }}" + devices: "{{ devices | default([]) | union([device]) }}" with_dict: "{{ ansible_facts['devices'] }}" when: - osd_auto_discovery | default(False) | bool @@ -85,4 +87,5 @@ - item.value.sectors != "0" - item.value.partitions|count == 0 - item.value.holders|count == 0 + - ansible_facts['mounts'] | selectattr('device', 'equalto', device) | length == 0 - item.key is not match osd_auto_discovery_exclude