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-copy-volimg.patch b/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
index 8dea089..74b04f2 100644
--- a/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
+++ b/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
@@ -1,7 +1,7 @@
-From 8991fe8faa2b05a1997259738c4feb3134565126 Mon Sep 17 00:00:00 2001
+From 682dc2d25fc7f04de77c8ea60e76189d5b714566 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Mon, 26 Sep 2022 16:04:36 +0300
-Subject: [PATCH 06/10] StorPool: drop copy_image_to_volume() and
+Subject: [PATCH 04/10] StorPool: drop copy_image_to_volume() and
copy_volume_to_image()
These methods seem to be leftovers from a bygone era when the parent
@@ -14,10 +14,10 @@
1 file changed, 43 deletions(-)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index c183a506d..956f7ae5a 100644
+index d1c6f0ca5..37e36fd61 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
-@@ -316,49 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -315,49 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
'pools': pools
}
@@ -68,5 +68,5 @@
size = int(new_size) * units.Gi
name = self._attach.volumeName(volume['id'])
--
-2.40.1
+2.42.0