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-leave-it-to-brick.patch b/patches/openstack/cinder/sep-sp-leave-it-to-brick.patch
index 1f3233d..e4583e8 100644
--- a/patches/openstack/cinder/sep-sp-leave-it-to-brick.patch
+++ b/patches/openstack/cinder/sep-sp-leave-it-to-brick.patch
@@ -1,7 +1,7 @@
-From ad5d9ec1cfb4dad9e3d4e2137d915ebe32e1d53f Mon Sep 17 00:00:00 2001
+From 9f79ab1ac4e5392b7c1ad8ab6f327abecea6e528 Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Tue, 20 Apr 2021 17:46:41 +0300
-Subject: [PATCH 04/10] StorPool: drop _attach_volume() and _detach_volume()
+Subject: [PATCH 02/10] StorPool: drop _attach_volume() and _detach_volume()
Our os-brick connector already handles the "keep track of which volume
is attached for what reason" calls to storpool.spopenstack. However,
@@ -38,7 +38,7 @@
def test_noop_functions(self):
self.driver.terminate_connection(None, None)
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index 8c2989fa8..cffbe9ee0 100644
+index d42d1c68c..1fc4262b2 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -168,6 +168,7 @@ class StorPoolDriver(driver.VolumeDriver):
@@ -49,7 +49,7 @@
}}
def terminate_connection(self, volume, connector, **kwargs):
-@@ -315,45 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -314,45 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
'pools': pools
}
@@ -109,5 +109,5 @@
+ encrypted StorPool volumes by dropping the needlessly and incompletely
+ overridden `_attach_volume()` and `_detach_volume()` methods.
--
-2.40.1
+2.42.0