e6ddff6eb0
* integrate create filestore OSD patch
The ceph-disk default create bluestore in mimic version.
For maximize compability, still create filestore OSD here.
* prepare osd to be started via init script
use osd id already configured in the database
instead of generating a new one
* fix ceph osd disk partition for nvme disks
Story: 2003605
Depends-On: Ic9c4aed8dbab5d3e141cf9c1b2b1892731b14779
Change-Id: Iaa3319a7647e5622037d12c53673da0e4199ceb4
Co-Authored-By: Daniel Badea <daniel.badea@intel.com>
Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
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
|
|
|