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
30 lines
876 B
Diff
30 lines
876 B
Diff
From 7a4c325194885dc43fc87f7094873e0067801652 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] 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 2187361..d9cf5b1 100644
|
|
--- a/manifests/osd.pp
|
|
+++ b/manifests/osd.pp
|
|
@@ -61,7 +61,7 @@ define ceph::osd (
|
|
|
|
include ::ceph::params
|
|
|
|
- $data = $name
|
|
+ $data = generate('/bin/bash','-c',"/bin/readlink -f ${name}")
|
|
|
|
if $cluster {
|
|
$cluster_name = $cluster
|
|
--
|
|
2.7.4
|
|
|