bac46cc0e0
This work is part of Debian integration effort. This work only affects debian. We package the same version of ceph for both CentOS and Debian. Since we know the puppet-ceph module on CentOS is supposed to work, use this on Debian also to reduce testing and possible issues. Patches were copied from CentOS and not touched. Drop one patch to metadata.json, we know we have some work to do in that area to clear puppet warnings, but will be done part of a generic clearing puppet warnings effort. The sources need to be patched to work with debhelper-compat 13, which we don't care now. There are some integration issues, but testing so far revealed that during a puppet replay for aio manifest ceph data and ceph journal partitions were created. Story: 2009101 Task: 43431 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I90adc736ea52e6c4f9946520156f53e572c224cc
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
From 828af5dec53192207637d15397887e058d6ea0fb Mon Sep 17 00:00:00 2001
|
|
From: Daniel Badea <daniel.badea@windriver.com>
|
|
Date: Fri, 26 Apr 2019 00:22:12 +0000
|
|
Subject: [PATCH] wipe unprepared disks
|
|
|
|
---
|
|
manifests/osd.pp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/manifests/osd.pp b/manifests/osd.pp
|
|
index 5bd30c5..ab65924 100644
|
|
--- a/manifests/osd.pp
|
|
+++ b/manifests/osd.pp
|
|
@@ -158,7 +158,7 @@ umount /var/lib/ceph/osd/ceph-${osdid}
|
|
# 2. The uuid for the OSD we are configuring matches the uuid for the
|
|
# OSD on the disk. We don't want to attempt to re-use an OSD that
|
|
# had previously been deleted.
|
|
- unless => "/usr/sbin/ceph-disk list | grep -v 'unknown cluster' | grep \" *$(readlink -f ${data}).*ceph data\" | grep 'osd uuid ${uuid}'",
|
|
+ unless => "/usr/sbin/ceph-disk list | grep -v 'unknown cluster' | grep \" *$(readlink -f ${data}).*ceph data\" | grep -v unprepared | grep 'osd uuid ${uuid}'",
|
|
|
|
logoutput => true,
|
|
timeout => $exec_timeout,
|
|
--
|
|
1.8.3.1
|
|
|