integ/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch
Shuicheng Lin d3aafc9709 de-fuzz fuzzy patch in puppet-ceph
Fuzzy patch will cause potential build failure issue. Correct the
line number in patch file to de-fuzz it.

Closes-Bug: 1804561

Change-Id: Ic804485b42a789d849c7538b1991c5cc88213553
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2018-11-22 23:54:57 +08:00

33 lines
998 B
Diff

From a7400d67bc6c89ea0aa9a408f7f35689924c8a99 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Wed, 31 Oct 2018 19:29:45 +0000
Subject: [PATCH] add ceph-disk-prepare-invalid-data-disk-value patch
---
SPECS/puppet-ceph.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-ceph.spec b/SPECS/puppet-ceph.spec
index 78e4a1b..f4dc098 100644
--- a/SPECS/puppet-ceph.spec
+++ b/SPECS/puppet-ceph.spec
@@ -13,6 +13,7 @@ Patch0002: 0002-Newton-rebase-fixes.patch
Patch0003: 0003-Ceph-Jewel-rebase.patch
Patch0004: 0004-US92424-Add-OSD-support-for-persistent-naming.patch
Patch0005: 0005-Remove-puppetlabs-apt-as-ceph-requirement.patch
+Patch0006: 0006-ceph-disk-prepare-invalid-data-disk-value.patch
BuildArch: noarch
@@ -33,6 +34,7 @@ Community Developed Ceph Module
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
+%patch0006 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1