diff --git a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0011-osd-add-support-for-mpath.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0011-osd-add-support-for-mpath.patch index 3511c2598..931d5f54d 100644 --- a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0011-osd-add-support-for-mpath.patch +++ b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0011-osd-add-support-for-mpath.patch @@ -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 -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,11 +15,11 @@ Signed-off-by: Joao Pedro Alexandroni "/bin/true # comment to satisfy puppet syntax requirements set -ex -disk=$(readlink -f ${data}) @@ -36,7 +36,7 @@ index df7489f..f4d566c 100644 ceph auth del osd.${osdid} || true part=\${disk} @@ -148,7 +154,11 @@ if [[ \$part == *nvme* ]]; then - else + else part=\${part}1 fi -mount $(readlink -f \${part}) /var/lib/ceph/osd/ceph-${osdid} @@ -61,7 +61,7 @@ index df7489f..f4d566c 100644 + ceph-disk list | grep -v 'unknown cluster' | grep \" *$(readlink -f ${data}).*ceph data\" | grep -v unprepared | grep 'osd uuid ${uuid}' +fi +", - + logoutput => true, timeout => $exec_timeout, @@ -182,7 +199,11 @@ restorecon -R $(readlink -f ${data}) @@ -129,5 +129,6 @@ index df7489f..f4d566c 100644 fi 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 +