Update the StorPool Cinder patches
Catch up with a change that modifies the signature of a function that
we remove outright.
Change-Id: Id862bf377628bad8c8ff9e5b42a2be5dc6c4d27a
diff --git a/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch b/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
index 74b04f2..6fe2319 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 682dc2d25fc7f04de77c8ea60e76189d5b714566 Mon Sep 17 00:00:00 2001
+From 7daed00eb1208ed62a9bd7f8432ed6d48b2efb01 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 04/10] StorPool: drop copy_image_to_volume() and
+Subject: [PATCH 3/9] StorPool: drop copy_image_to_volume() and
copy_volume_to_image()
These methods seem to be leftovers from a bygone era when the parent
@@ -10,14 +10,14 @@
Change-Id: I6e1a9026e677aee6c7ccad908fe6f92dc253762a
Closes-Bug: #2002996
---
- cinder/volume/drivers/storpool.py | 43 -------------------------------
- 1 file changed, 43 deletions(-)
+ cinder/volume/drivers/storpool.py | 45 -------------------------------
+ 1 file changed, 45 deletions(-)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index d1c6f0ca5..37e36fd61 100644
+index c595c1c0c..37e36fd61 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
-@@ -315,49 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -315,51 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
'pools': pools
}
@@ -49,7 +49,8 @@
- '%(vol)s: %(err)s',
- {'name': name, 'vol': volname, 'err': e})
-
-- def copy_image_to_volume(self, context, volume, image_service, image_id):
+- def copy_image_to_volume(self, context, volume, image_service, image_id,
+- disable_sparse=False):
- req_id = context.request_id
- name = self._attach.volumeName(volume['id'])
- self._attach.add(req_id, {
@@ -60,7 +61,8 @@
- })
- try:
- return super(StorPoolDriver, self).copy_image_to_volume(
-- context, volume, image_service, image_id)
+- context, volume, image_service, image_id,
+- disable_sparse=disable_sparse)
- finally:
- self._attach.remove(req_id)
-
@@ -68,5 +70,5 @@
size = int(new_size) * units.Gi
name = self._attach.volumeName(volume['id'])
--
-2.42.0
+2.43.0