Update the StorPool Cinder patches
We reordered some of the patches we apply upstream, so later patches would
generate conflicts if applied to an attempt to build earlier ones.
Change-Id: I4040830a11c5e5979dcaf1eaa50e8aa3f66a4412
diff --git a/patches/openstack/cinder/sep-sp-rm-backup.patch b/patches/openstack/cinder/sep-sp-rm-backup.patch
index 1f49d4c..8c7d334 100644
--- a/patches/openstack/cinder/sep-sp-rm-backup.patch
+++ b/patches/openstack/cinder/sep-sp-rm-backup.patch
@@ -1,7 +1,7 @@
-From 597e42b37bc722de3e075f3b1a34b79759cb5d86 Mon Sep 17 00:00:00 2001
+From a1b26cc52eb2855226052e19301e6e6827dcb699 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Mon, 11 May 2020 11:02:53 +0300
-Subject: [PATCH 05/10] StorPool driver: remove the obsolete backup_volume()
+Subject: [PATCH 03/10] StorPool driver: remove the obsolete backup_volume()
Follow suit with I984de3df803f12dbb95e3309e668b3fbd519e70f.
@@ -11,10 +11,10 @@
1 file changed, 29 deletions(-)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index cffbe9ee0..c183a506d 100644
+index 1fc4262b2..d1c6f0ca5 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
-@@ -316,35 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -315,35 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
'pools': pools
}
@@ -51,5 +51,5 @@
req_id = context.request_id
volname = self._attach.volumeName(volume['id'])
--
-2.40.1
+2.42.0