diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml index 4e8dd1aae..f35bea199 100644 --- a/roles/ceph-osd/tasks/activate_osds.yml +++ b/roles/ceph-osd/tasks/activate_osds.yml @@ -10,6 +10,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - journal_collocation - osd_auto_discovery @@ -35,6 +36,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - osd_auto_discovery - dmcrypt_journal_collocation diff --git a/roles/ceph-osd/tasks/check_devices_auto.yml b/roles/ceph-osd/tasks/check_devices_auto.yml index 19d82ba75..889239727 100644 --- a/roles/ceph-osd/tasks/check_devices_auto.yml +++ b/roles/ceph-osd/tasks/check_devices_auto.yml @@ -21,6 +21,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - name: fix partitions gpt header or labels of the osd disks (autodiscover disks) shell: "sgdisk --zap-all --clear --mbrtogpt -- '/dev/{{ item.0.item.key }}' || sgdisk --zap-all --clear --mbrtogpt -- '/dev/{{ item.0.item.key }}'" @@ -32,6 +33,7 @@ - ansible_devices is defined - item.0.item.value.removable == "0" - item.0.item.value.partitions|count == 0 + - item.value.holders|count == 0 - item.0.rc != 0 - name: check if a partition named 'ceph' exists (autodiscover disks) diff --git a/roles/ceph-osd/tasks/scenarios/bluestore.yml b/roles/ceph-osd/tasks/scenarios/bluestore.yml index bf49d43f2..78897e288 100644 --- a/roles/ceph-osd/tasks/scenarios/bluestore.yml +++ b/roles/ceph-osd/tasks/scenarios/bluestore.yml @@ -17,6 +17,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - bluestore - osd_auto_discovery diff --git a/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml b/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml index cf656ed15..528856f5b 100644 --- a/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml +++ b/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml @@ -16,6 +16,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - dmcrypt_journal_collocation - osd_auto_discovery diff --git a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml b/roles/ceph-osd/tasks/scenarios/journal_collocation.yml index 4ea5788f1..0e1d08a12 100644 --- a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml +++ b/roles/ceph-osd/tasks/scenarios/journal_collocation.yml @@ -17,6 +17,7 @@ - ansible_devices is defined - item.value.removable == "0" - item.value.partitions|count == 0 + - item.value.holders|count == 0 - journal_collocation - osd_auto_discovery