From d3aafc970963badebbaf012facfe977ad7ef5c42 Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Thu, 22 Nov 2018 23:49:58 +0800 Subject: [PATCH] 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 --- ...-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch index c22695168..96e6b576e 100644 --- a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch +++ b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch @@ -11,7 +11,7 @@ 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 -@@ -15,6 +15,7 @@ Patch0002: 0002-Newton-rebase-fixes.patch +@@ -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 @@ -19,7 +19,7 @@ index 78e4a1b..f4dc098 100644 BuildArch: noarch -@@ -35,6 +36,7 @@ Community Developed Ceph Module +@@ -33,6 +34,7 @@ Community Developed Ceph Module %patch0003 -p1 %patch0004 -p1 %patch0005 -p1