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-volume.patch b/patches/openstack/cinder/sep-sp-clone-volume.patch
index 4e18294..6e7f90f 100644
--- a/patches/openstack/cinder/sep-sp-clone-volume.patch
+++ b/patches/openstack/cinder/sep-sp-clone-volume.patch
@@ -1,7 +1,7 @@
-From dacb33483344276f909e1be008d0eb45758f1923 Mon Sep 17 00:00:00 2001
+From 842b39e2e8e73ea2dda84955d3ab99d9efbfa527 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Wed, 20 Apr 2022 15:47:39 +0300
-Subject: [PATCH 09/10] StorPool: create_cloned_volume() improvements
+Subject: [PATCH 07/10] StorPool: create_cloned_volume() improvements
If the source and destination volumes are in the same StorPool template
(as defined by either the volume type or the global config setting),
@@ -282,7 +282,7 @@
self.driver.create_volume({'id': 'cfgtempl2', 'name': 'v1', 'size': 1,
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index dcad96bb8..b15a201c3 100644
+index 97d188fd4..5b4ea0d31 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -19,11 +19,13 @@ import platform
@@ -422,5 +422,5 @@
+ StorPool templates (exposed as Cinder storage pools) if requested,
+ eliminating some data duplication in the underlying StorPool cluster.
--
-2.40.1
+2.42.0