Update the StorPool Cinder patches
The context for some of them changed in the Cinder master branch, so
`git am` was no longer able to apply them directly. Also, import some
updates to the patches - documentation, release notes, etc - so that
they match exactly what is submitted to the OpenDev Gerrit instance for
merging upstream.
Change-Id: Iacd95c275340faa435a2bf3a83a61e28ab8f8bf3
diff --git a/patches/openstack/cinder/sep-sp-clone-volume.patch b/patches/openstack/cinder/sep-sp-clone-volume.patch
index b0132ee..4e18294 100644
--- a/patches/openstack/cinder/sep-sp-clone-volume.patch
+++ b/patches/openstack/cinder/sep-sp-clone-volume.patch
@@ -1,4 +1,4 @@
-From 81f472830ba09a42d887c22fc5f0a938ff9498ca Mon Sep 17 00:00:00 2001
+From dacb33483344276f909e1be008d0eb45758f1923 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
@@ -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..58b64bced 100644
+index dcad96bb8..b15a201c3 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -19,11 +19,13 @@ import platform
@@ -313,9 +313,9 @@
+ src_template = self._template_from_volume(src_volume)
+
+ template = self._template_from_volume(volume)
-+ LOG.debug('clone volume id %(vol_id)s template %(template)s', {
-+ 'vol_id': repr(volume['id']),
-+ 'template': repr(template),
++ LOG.debug('clone volume id %(vol_id)r template %(template)r', {
++ 'vol_id': volume['id'],
++ 'template': template,
+ })
+ if template == src_template:
+ LOG.info('Using baseOn to clone a volume into the same template')
@@ -411,16 +411,16 @@
# Datera
diff --git a/releasenotes/notes/storpool-clone-better-dca90f40c9273de9.yaml b/releasenotes/notes/storpool-clone-better-dca90f40c9273de9.yaml
new file mode 100644
-index 000000000..180427d9e
+index 000000000..9d512c831
--- /dev/null
+++ b/releasenotes/notes/storpool-clone-better-dca90f40c9273de9.yaml
@@ -0,0 +1,6 @@
+---
+features:
+ - |
-+ StorPool driver: improved the way volumes are clonsed into different
++ StorPool driver: improved the way volumes are cloned into different
+ StorPool templates (exposed as Cinder storage pools) if requested,
+ eliminating some data duplication in the underlying StorPool cluster.
--
-2.39.2
+2.40.1