Reshuffle the patches, drop copy-volume-to-image and vice versa
The patches will be submitted upstream in a slightly different manner,
so reflect that in the CI runs.
Change-Id: I114cbb2fb8f15beb908f6ce574ef50d12f43d3d7
diff --git a/patches/openstack/cinder/sep-sp-clone-across-pools.patch b/patches/openstack/cinder/sep-sp-clone-across-pools.patch
new file mode 100644
index 0000000..ba8a79c
--- /dev/null
+++ b/patches/openstack/cinder/sep-sp-clone-across-pools.patch
@@ -0,0 +1,39 @@
+From 5851b3cbf356620b43e82afcd1b2c55ed1a9cb0a 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 3/7] StorPool: declare the clone_across_pools capability
+
+Change-Id: I5338c6c4f53a448e495f695cd64b36b722cd947d
+---
+ cinder/volume/drivers/storpool.py | 1 +
+ doc/source/reference/support-matrix.ini | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
+index 47685cb3f..328f76c00 100644
+--- a/cinder/volume/drivers/storpool.py
++++ b/cinder/volume/drivers/storpool.py
+@@ -308,6 +308,7 @@ class StorPoolDriver(driver.VolumeDriver):
+ 'driver_version': self.VERSION,
+ 'storage_protocol': constants.STORPOOL,
+
++ 'clone_across_pools': True,
+ 'sparse_copy_volume': True,
+
+ 'pools': pools
+diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
+index d01ecc15c..33c9b0b91 100644
+--- a/doc/source/reference/support-matrix.ini
++++ b/doc/source/reference/support-matrix.ini
+@@ -1061,7 +1061,7 @@ driver.rbd=missing
+ driver.rbd_iscsi=missing
+ driver.sandstone=missing
+ driver.seagate=missing
+-driver.storpool=missing
++driver.storpool=complete
+ driver.synology=missing
+ driver.toyou_netstor=missing
+ driver.vrtsaccess=missing
+--
+2.35.1
+