Add the "really detach" patch, update the attach/detach one.
Change-Id: I8de05d4d40f7d7f9ee2249b07b421bc031a162a3
diff --git a/patches/openstack/cinder/leave-it-to-brick.patch b/patches/openstack/cinder/leave-it-to-brick.patch
index 52fc120..c5603a5 100644
--- a/patches/openstack/cinder/leave-it-to-brick.patch
+++ b/patches/openstack/cinder/leave-it-to-brick.patch
@@ -1,7 +1,7 @@
-From d38aa0fff72db40f4501bfac661313c5aeda51f3 Mon Sep 17 00:00:00 2001
+From b0710f215a9bea69bfdb35d0485c38cd8a87204e 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] StorPool: drop _attach_volume() and _detach_volume().
+Subject: [PATCH 3/8] 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,
@@ -14,10 +14,13 @@
in the attachment info...
Change-Id: I5da7ae04b87b4fd52a682a6545060e852174f6c8
+Closes-Bug: #1939241
---
.../unit/volume/drivers/test_storpool.py | 6 ++-
- cinder/volume/drivers/storpool.py | 44 ++-----------------
- 2 files changed, 8 insertions(+), 42 deletions(-)
+ cinder/volume/drivers/storpool.py | 46 ++-----------------
+ ...ch-encrypted-volumes-783c723683b8f9a9.yaml | 7 +++
+ 3 files changed, 16 insertions(+), 43 deletions(-)
+ create mode 100644 releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml
diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py
index a5f763b96..843283db4 100644
@@ -41,7 +44,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 cf5707cbc..a1388677b 100644
+index 47685cb3f..4d79a82f8 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -1,4 +1,4 @@
@@ -50,7 +53,7 @@
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
-@@ -90,6 +90,8 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -91,9 +91,11 @@ class StorPoolDriver(driver.VolumeDriver):
1.2.2 - Reintroduce the driver into OpenStack Queens,
add ignore_errors to the internal _detach_volume() method
1.2.3 - Advertise some more driver capabilities.
@@ -58,8 +61,12 @@
+ connector will handle this.
"""
- VERSION = '1.2.3'
-@@ -167,6 +169,7 @@ class StorPoolDriver(driver.VolumeDriver):
+- VERSION = '1.2.3'
++ VERSION = '2.0.0'
+ CI_WIKI_NAME = 'StorPool_distributed_storage_CI'
+
+ def __init__(self, *args, **kwargs):
+@@ -168,6 +170,7 @@ class StorPoolDriver(driver.VolumeDriver):
'data': {
'client_id': self._storpool_client_id(connector),
'volume': volume['id'],
@@ -67,7 +74,7 @@
}}
def terminate_connection(self, volume, connector, **kwargs):
-@@ -312,45 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -313,45 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
'pools': pools
}
@@ -113,6 +120,19 @@
def backup_volume(self, context, backup, backup_service):
volume = self.db.volume_get(context, backup['volume_id'])
req_id = context.request_id
+diff --git a/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml b/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml
+new file mode 100644
+index 000000000..b19904041
+--- /dev/null
++++ b/releasenotes/notes/bug-1939241-storpool-attach-encrypted-volumes-783c723683b8f9a9.yaml
+@@ -0,0 +1,7 @@
++---
++fixes:
++ - |
++ StorPool driver `bug #1939241
++ <https://bugs.launchpad.net/cinder/+bug/1939241>`_: Fixed the creation of
++ encrypted StorPool volumes by dropping the needlessly and incompletely
++ overridden `_attach_volume()` and `_detach_volume()` methods.
--
-2.30.2
+2.35.1