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-cosmetic-comments.patch b/patches/openstack/cinder/sep-sp-cosmetic-comments.patch
index d2ea5d3..0595830 100644
--- a/patches/openstack/cinder/sep-sp-cosmetic-comments.patch
+++ b/patches/openstack/cinder/sep-sp-cosmetic-comments.patch
@@ -1,7 +1,7 @@
-From 1bf20850bdbd86997a59bc639ae51be71dd99da8 Mon Sep 17 00:00:00 2001
+From 0912d760d1329eb3e1ccfc79b99a916e810d0f20 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Mon, 13 Feb 2023 11:15:27 +0200
-Subject: [PATCH 03/10] StorPool: cosmetic: comment headings instead of empty
+Subject: [PATCH 01/10] StorPool: cosmetic: comment headings instead of empty
lines
Instead of using empty lines to separate semantically different
@@ -14,10 +14,10 @@
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index 328f76c00..8c2989fa8 100644
+index 47685cb3f..d42d1c68c 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
-@@ -302,15 +302,16 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -302,14 +302,15 @@ class StorPoolDriver(driver.VolumeDriver):
) for t in templates]
self._stats = {
@@ -29,7 +29,6 @@
'storage_protocol': constants.STORPOOL,
-
+ # Driver capabilities
- 'clone_across_pools': True,
'sparse_copy_volume': True,
-
+ # The actual pools data
@@ -37,5 +36,5 @@
}
--
-2.40.1
+2.42.0