starlingx
/
integ
Code Issues Proposed changes

puppet-ceph update broke the build 

There were a few missing white spaces,
so the patch 11 could not be applied
correctly

TEST PLAN:

PASS: Patch 11 applied correctly

Closes-bug: #1975725

Signed-off-by: Joao Pedro Alexandroni <JoaoPedroAlexandroni.CordovadeSouza@windriver.com>
Change-Id: I3b9ec6a2245ecee358e32ccd12dfa26d51f84af5
This commit is contained in:
Joao Pedro Alexandroni 2022-05-25 15:17:47 -03:00 committed by João Pedro Alexandroni Cordova de Sousa
parent f852131b65
commit 6a3eb4c41e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0011-osd-add-support-for-mpath.patch
View File

@ -1,7 +1,7 @@
From 30fa8f9a648a8ed00adf7a1015199e63f2b20fd5 Mon Sep 17 00:00:00 2001
From 1259ec9c739e1e6032df5cc5ebb104ba1709bf5b Mon Sep 17 00:00:00 2001
From: Joao Pedro Alexandroni
<JoaoPedroAlexandroni.CordovadeSouza@windriver.com>
Date: Mon, 23 May 2022 16:39:14 -0300
Date: Wed, 25 May 2022 14:40:46 -0300
Subject: [PATCH] osd add support for mpath
The device node in /dev/ and device path in /dev/disk/by-path
@ -15,7 +15,7 @@ Signed-off-by: Joao Pedro Alexandroni <JoaoPedroAlexandroni.CordovadeSouza@windr
1 file changed, 46 insertions(+), 9 deletions(-)
diff --git a/manifests/osd.pp b/manifests/osd.pp
index df7489f..f4d566c 100644
index ab65924..098b69e 100644
--- a/manifests/osd.pp
+++ b/manifests/osd.pp
@@ -138,8 +138,14 @@ test -z $(ceph-disk list $(readlink -f ${data}) | egrep -o '[0-9a-f]{8}-([0-9a-f
@ -130,4 +130,5 @@ index df7489f..f4d566c 100644
if [ -z \"\$id\" ] ; then
id=$(ls -ld /var/lib/ceph/osd/${cluster_name}-* | sed -nEe \"s:.*/${cluster_name}-([0-9]+) *-> *\${disk}\$:\\1:p\" || true)
--
2.17.1
2.36.1