From c958bc1ddfb0a951c1269304f1f7a068e5b5ba43 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 1 Oct 2019 09:34:14 +0200 Subject: [PATCH] validate: fix gpt header check Check for gpt header when osd scenario is lvm or lvm batch. Signed-off-by: Guillaume Abrioux (cherry picked from commit 272d16e101984de41bba6fcbe6134bf39e547341) --- roles/ceph-validate/tasks/check_devices.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/ceph-validate/tasks/check_devices.yml b/roles/ceph-validate/tasks/check_devices.yml index b2568f779..ecfa37985 100644 --- a/roles/ceph-validate/tasks/check_devices.yml +++ b/roles/ceph-validate/tasks/check_devices.yml @@ -1,22 +1,27 @@ --- -- name: devices validation - when: devices is defined +- name: check no gpt header is present when osd scenario is lvm/lvm-batch block: - name: read information about the devices parted: - device: "{{ item }}" + device: "{{ item.data if item.data_vg is undefined and lvm_volumes is defined else item if devices is defined else omit }}" unit: MiB register: parted_results - with_items: "{{ devices }}" + with_items: "{{ lvm_volumes | default(devices) }}" + when: + - inventory_hostname in groups.get(osd_group_name, []) + - (item.data is defined and item.data_vg is undefined) or devices is defined - name: fail when gpt header found on osd devices fail: msg: "{{ item.disk.dev }} has gpt header, please remove it." with_items: "{{ parted_results.results }}" when: + - item.skipped is undefined - item.disk.table == 'gpt' - item.partitions | length == 0 +- name: check devices are block devices + block: - name: get devices information parted: device: "{{ item }}" -- 2.39.5