1 From 828af5dec53192207637d15397887e058d6ea0fb Mon Sep 17 00:00:00 2001
2 From: Daniel Badea <daniel.badea@windriver.com>
3 Date: Fri, 26 Apr 2019 00:22:12 +0000
4 Subject: [PATCH] wipe unprepared disks
7 manifests/osd.pp | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
10 diff --git a/manifests/osd.pp b/manifests/osd.pp
11 index 5bd30c5..ab65924 100644
12 --- a/manifests/osd.pp
13 +++ b/manifests/osd.pp
14 @@ -158,7 +158,7 @@ umount /var/lib/ceph/osd/ceph-${osdid}
15 # 2. The uuid for the OSD we are configuring matches the uuid for the
16 # OSD on the disk. We don't want to attempt to re-use an OSD that
17 # had previously been deleted.
18 - unless => "/usr/sbin/ceph-disk list | grep -v 'unknown cluster' | grep \" *$(readlink -f ${data}).*ceph data\" | grep 'osd uuid ${uuid}'",
19 + unless => "/usr/sbin/ceph-disk list | grep -v 'unknown cluster' | grep \" *$(readlink -f ${data}).*ceph data\" | grep -v unprepared | grep 'osd uuid ${uuid}'",
22 timeout => $exec_timeout,