diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml index e0c11f56b..9b1088be5 100644 --- a/roles/ceph-osd/tasks/activate_osds.yml +++ b/roles/ceph-osd/tasks/activate_osds.yml @@ -8,7 +8,9 @@ - devices changed_when: false failed_when: false - when: item.0.rc != 0 + when: + not item.0.get("skipped") and + item.0.get("rc", 0) != 0 # NOTE (leseb): this task is for partitions because we don't explicitly use a partition. - name: activate osd(s) when device is a partition @@ -18,7 +20,9 @@ - devices changed_when: false failed_when: false - when: item.0.rc == 0 + when: + not item.0.get("skipped") and + item.0.get("rc", 0) == 0 - include: osd_fragment.yml when: crush_location diff --git a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml b/roles/ceph-osd/tasks/scenarios/journal_collocation.yml index eff482bf9..92102d44c 100644 --- a/roles/ceph-osd/tasks/scenarios/journal_collocation.yml +++ b/roles/ceph-osd/tasks/scenarios/journal_collocation.yml @@ -29,8 +29,10 @@ - combined_ispartition_results.results - devices when: - item.0.rc != 0 and - item.1.rc != 0 and + not item.0.get("skipped") and + not item.1.get("skipped") and + item.0.get("rc", 0) != 0 and + item.1.get("rc", 0) != 0 and journal_collocation and not osd_auto_discovery diff --git a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml index 37f4aed20..32f5a450f 100644 --- a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml +++ b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml @@ -19,8 +19,10 @@ changed_when: false ignore_errors: true when: - item.0.rc != 0 and - item.1.rc != 0 and + not item.0.get("skipped") and + not item.1.get("skipped") and + item.0.get("rc", 0) != 0 and + item.1.get("rc", 0) != 0 and raw_multi_journal and not osd_auto_discovery