From 63cbcc82602d3fdbf4d20184102846bad1c29844 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 27 Jul 2017 11:39:19 +0200 Subject: [PATCH] osd: fail check mount partition if not skipped MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We forgot to handle the case where "check if any of the raw partitions are mounted" task gets skipped. Signed-off-by: Sébastien Han --- roles/ceph-osd/tasks/check_devices_auto.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/roles/ceph-osd/tasks/check_devices_auto.yml b/roles/ceph-osd/tasks/check_devices_auto.yml index fa948106f..7a1b848ec 100644 --- a/roles/ceph-osd/tasks/check_devices_auto.yml +++ b/roles/ceph-osd/tasks/check_devices_auto.yml @@ -8,7 +8,7 @@ register: ispartition_results when: - ansible_devices is defined - - item.value.removable == "0" + - item.value.removable == 0 - name: check if any of the raw partitions are mounted shell: "mount |grep -sq '^/dev/{{ item.key }} '" @@ -21,15 +21,17 @@ always_run: true when: - ansible_devices is defined - - item.value.removable == "0" + - item.value.removable == 0 - item.value.partitions|count == 0 - item.value.holders|count == 0 - name: fail if any of the raw partitions are mounted fail: msg: "OSD device autodetection failed because one or more raw partitions is mounted on the host." - when: item.rc == 0 with_items: "{{ mount_cmd.results }}" + when: + - item.rc == 0 + - not item.get("skipped") - name: check the partition status of the osd disks (autodiscover disks) shell: "parted --script /dev/{{ item.key }} print > /dev/null 2>&1" @@ -40,7 +42,7 @@ register: osd_partition_status_results when: - ansible_devices is defined - - item.value.removable == "0" + - item.value.removable == 0 - item.value.partitions|count == 0 - item.value.holders|count == 0 @@ -52,7 +54,7 @@ changed_when: false when: - ansible_devices is defined - - item.0.item.value.removable == "0" + - item.0.item.value.removable == 0 - item.0.item.value.partitions|count == 0 - item.0.item.value.holders|count == 0 - item.0.rc != 0 @@ -66,4 +68,4 @@ register: parted_results when: - ansible_devices is defined - - item.value.removable == "0" + - item.value.removable == 0 -- 2.39.5