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-clone-across-pools.patch b/patches/openstack/cinder/sep-clone-across-pools.patch
index 33064ec..fade092 100644
--- a/patches/openstack/cinder/sep-clone-across-pools.patch
+++ b/patches/openstack/cinder/sep-clone-across-pools.patch
@@ -1,7 +1,7 @@
-From c75191ca7990e28528b008066f4c2b89f6dab72f Mon Sep 17 00:00:00 2001
+From 8ce9bb75fb32c921043b14b43884c8b1660cd9b8 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Wed, 22 Jun 2022 10:04:31 +0300
-Subject: [PATCH 01/10] Add the clone_across_pools driver capability
+Subject: [PATCH 08/10] Add the clone_across_pools driver capability
Let drivers declare that they can clone a volume into a different pool and
relax the checks when creating a volume from an image (both with and
@@ -269,7 +269,7 @@
for image_volume in image_volumes:
# For the case image volume is stored in the service tenant,
diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
-index c2c52ec82..26e30d67b 100644
+index 104291563..88c037279 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -356,7 +356,8 @@ class VolumeManager(manager.CleanableManager,
@@ -283,10 +283,10 @@
LOG.info('Image-volume cache enabled for host %(host)s.',
{'host': self.host})
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
-index 514e2c016..163a7a37c 100644
+index 6c3af739e..3bb2be72b 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
-@@ -1035,3 +1035,81 @@ driver.win_iscsi=missing
+@@ -1048,3 +1048,81 @@ driver.win_iscsi=missing
driver.win_smb=missing
driver.yadro=complete
driver.zadara=missing
@@ -369,5 +369,5 @@
+driver.yadro=missing
+driver.zadara=missing
--
-2.40.1
+2.42.0