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-clone-across-pools.patch b/patches/openstack/cinder/sep-sp-clone-across-pools.patch
index 0cd1b26..4862989 100644
--- a/patches/openstack/cinder/sep-sp-clone-across-pools.patch
+++ b/patches/openstack/cinder/sep-sp-clone-across-pools.patch
@@ -1,7 +1,7 @@
-From a0ff072ee506ff7eedda4b727cd613b6032fcfd9 Mon Sep 17 00:00:00 2001
+From 381f77449f30d9a860eeef532963e21f895c00e9 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Wed, 22 Jun 2022 10:48:25 +0300
-Subject: [PATCH 02/10] StorPool: declare the clone_across_pools capability
+Subject: [PATCH 09/10] StorPool: declare the clone_across_pools capability
Change-Id: I5338c6c4f53a448e495f695cd64b36b722cd947d
---
@@ -12,22 +12,22 @@
create mode 100644 releasenotes/notes/storpool-clone-across-pools-b3f7923dee35503a.yaml
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index 47685cb3f..328f76c00 100644
+index 5b4ea0d31..b15a201c3 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
-@@ -308,6 +308,7 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -362,6 +362,7 @@ class StorPoolDriver(driver.VolumeDriver):
'driver_version': self.VERSION,
'storage_protocol': constants.STORPOOL,
-
+ # Driver capabilities
+ 'clone_across_pools': True,
'sparse_copy_volume': True,
-
+ # The actual pools data
'pools': pools
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
-index 163a7a37c..7ee51b722 100644
+index 3bb2be72b..7964d9807 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
-@@ -1102,7 +1102,7 @@ driver.rbd=missing
+@@ -1115,7 +1115,7 @@ driver.rbd=missing
driver.rbd_iscsi=missing
driver.sandstone=missing
driver.seagate=missing
@@ -49,5 +49,5 @@
+ which allows it to create a volume into an arbitrary StorPool-backed
+ volume type from a StorPool-backed Glance image.
--
-2.40.1
+2.42.0