d0ddf30a4c
Add debian infrastructure to build puppet-ceph as a debian packaging. Patches Dropped: 0005-Remove-puppetlabs-apt-as-ceph-requirement.patch 0004-US92424-Add-OSD-support-for-persistent-naming.patch 0006-ceph-disk-prepare-invalid-data-disk-value.patch 0008-ceph-mimic-prepare-activate-os.patch 0009-fix-ceph-osd-disk-partition-for-nvme-disks.patch Re-diffed: 0001-Roll-up-TIS-patches.patch 0002-Newton-rebase-fixes.patch 0003-ceph-jewel-rebase.patch 0004-US92424-Add-OSD-support-for-persistent-naming.patch 0005-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch The patches that were dropped needs to be re-worked for ceph-volume, since ceph-disk has been deprecated and not included in the Ceph version from Debian. 0001-Roll-up-TIS-patches.patch and 0003-ceph-jewel-rebase.patch were rebased because most of the systemd logic has been dropped as well and need to be redone. Story: 2009101 Task: 43431 Signed-off-by: Charles Short <charles.short@windriver.com> Change-Id: I5a66bcd274f2752d4c050fab25a7b1b8347b650e
30 lines
879 B
Diff
30 lines
879 B
Diff
From c207c353cbf883befa6070ccd80c2b4980a434fe Mon Sep 17 00:00:00 2001
|
|
From: Robert Church <robert.church@windriver.com>
|
|
Date: Thu, 13 Apr 2017 20:31:21 -0500
|
|
Subject: [PATCH 4/5] US92424: Add OSD support for persistent naming
|
|
|
|
This allows the manifest to provide udev generated /dev/disk/by-* links
|
|
to configure the OSDs without requiring any additional changes. The
|
|
'readlink -f' will produce the currently enumerated device node
|
|
associated with udev link.
|
|
---
|
|
manifests/osd.pp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/manifests/osd.pp b/manifests/osd.pp
|
|
index 1972caa..2bda784 100644
|
|
--- a/manifests/osd.pp
|
|
+++ b/manifests/osd.pp
|
|
@@ -84,7 +84,7 @@ define ceph::osd (
|
|
|
|
include ceph::params
|
|
|
|
- $data = $name
|
|
+ $data = generate('/bin/bash','-c',"/bin/readlink -f ${name}")
|
|
|
|
if $cluster {
|
|
$cluster_name = $cluster
|
|
--
|
|
2.30.2
|
|
|