Refresh the Cinder patches
Add the minor comment-only patch that was requested via a review.
Refresh the rest of the patches against the Cinder master branch.
Change-Id: I0a5f2b052654d36e2be2d86849c2436c0a34c80b
diff --git a/patches/openstack/cinder/sep-clone-across-pools.patch b/patches/openstack/cinder/sep-clone-across-pools.patch
index 40753e7..755f52f 100644
--- a/patches/openstack/cinder/sep-clone-across-pools.patch
+++ b/patches/openstack/cinder/sep-clone-across-pools.patch
@@ -1,7 +1,7 @@
-From 6809a2569d281eb6217edc3b7ce9663a996186fb Mon Sep 17 00:00:00 2001
+From af80e707f4a921d9c1e83fd9487b941406d20ecd Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Wed, 22 Jun 2022 10:04:31 +0300
-Subject: [PATCH 2/7] Add the clone_across_pools driver capability
+Subject: [PATCH 01/10] Add the clone_across_pools driver capability
Let drivers declare that they can clone a volume into a different pool and
relax the checks when creating a volume from an image (both with and
@@ -12,11 +12,11 @@
---
cinder/image/cache.py | 11 ++-
cinder/tests/unit/image/test_cache.py | 14 ++--
- .../volume/flows/test_create_volume_flow.py | 73 ++++++++++++++++++
+ .../volume/flows/test_create_volume_flow.py | 73 +++++++++++++++++
cinder/volume/flows/manager/create_volume.py | 8 +-
cinder/volume/manager.py | 3 +-
- doc/source/reference/support-matrix.ini | 76 +++++++++++++++++++
- 6 files changed, 172 insertions(+), 13 deletions(-)
+ doc/source/reference/support-matrix.ini | 78 +++++++++++++++++++
+ 6 files changed, 174 insertions(+), 13 deletions(-)
diff --git a/cinder/image/cache.py b/cinder/image/cache.py
index 6d30210a4..a79451bf2 100644
@@ -250,7 +250,7 @@
mock.MagicMock(), fake_db, fake_driver)
fake_image_service = fake_image.FakeImageService()
diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
-index 0ae3cb59d..45d06ebb9 100644
+index 905258bf4..963cc2d78 100644
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@ -741,8 +741,12 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
@@ -269,7 +269,7 @@
for image_volume in image_volumes:
# For the case image volume is stored in the service tenant,
diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
-index 2dcf7ae30..79a0ae9a2 100644
+index c2c52ec82..26e30d67b 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -356,7 +356,8 @@ class VolumeManager(manager.CleanableManager,
@@ -283,10 +283,10 @@
LOG.info('Image-volume cache enabled for host %(host)s.',
{'host': self.host})
diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini
-index 384a633da..d01ecc15c 100644
+index 7b4b3c38d..86a5660b8 100644
--- a/doc/source/reference/support-matrix.ini
+++ b/doc/source/reference/support-matrix.ini
-@@ -996,3 +996,79 @@ driver.win_iscsi=missing
+@@ -1022,3 +1022,81 @@ driver.win_iscsi=missing
driver.win_smb=missing
driver.yadro=complete
driver.zadara=missing
@@ -311,10 +311,12 @@
+driver.dell_emc_powerflex=missing
+driver.dell_emc_xtremio=missing
+driver.fujitsu_eternus=missing
++driver.fungible=missing
+driver.hitachi_vsp=missing
+driver.hpe_3par=missing
+driver.hpe_msa=missing
+driver.hpe_nimble=missing
++driver.hpe_xp=missing
+driver.huawei_t_v1=missing
+driver.huawei_t_v2=missing
+driver.huawei_v3=missing
@@ -367,5 +369,5 @@
+driver.yadro=missing
+driver.zadara=missing
--
-2.35.1
+2.39.2