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-iscsi.patch b/patches/openstack/cinder/sep-sp-iscsi.patch
index 5571ce5..8c07013 100644
--- a/patches/openstack/cinder/sep-sp-iscsi.patch
+++ b/patches/openstack/cinder/sep-sp-iscsi.patch
@@ -1,4 +1,4 @@
-From 6e24ec90deb5e5977a4654c0e9f7f02e99ddb131 Mon Sep 17 00:00:00 2001
+From 15fe701cfc698a2d8d3ce12ba33983a42e50411e Mon Sep 17 00:00:00 2001
From: Peter Penchev <openstack-dev@storpool.com>
Date: Mon, 12 Mar 2018 12:00:10 +0200
Subject: [PATCH 10/10] Add iSCSI export support to the StorPool driver
@@ -25,15 +25,15 @@
Change-Id: I9de64306e0e6976268df782053b0651dd1cca96f
---
- .../unit/volume/drivers/test_storpool.py | 435 +++++++++++++++++-
+ .../unit/volume/drivers/test_storpool.py | 437 +++++++++++++++++-
cinder/volume/drivers/storpool.py | 374 ++++++++++++++-
.../drivers/storpool-volume-driver.rst | 60 ++-
- .../storpool-iscsi-cefcfe590a07c5c7.yaml | 10 +
- 4 files changed, 870 insertions(+), 9 deletions(-)
+ .../storpool-iscsi-cefcfe590a07c5c7.yaml | 13 +
+ 4 files changed, 874 insertions(+), 10 deletions(-)
create mode 100644 releasenotes/notes/storpool-iscsi-cefcfe590a07c5c7.yaml
diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py
-index 95a1ffffd..842790ab4 100644
+index 95a1ffffd..2b76e7c75 100644
--- a/cinder/tests/unit/volume/drivers/test_storpool.py
+++ b/cinder/tests/unit/volume/drivers/test_storpool.py
@@ -14,15 +14,25 @@
@@ -403,6 +403,15 @@
({'no-host': None}, KeyError),
({'host': 'sbad'}, driver.StorPoolConfigurationInvalid),
)
+@@ -286,7 +584,7 @@ class StorPoolTestCase(test.TestCase):
+ self.assertEqual(21, pool['total_capacity_gb'])
+ self.assertEqual(5, int(pool['free_capacity_gb']))
+
+- self.assertTrue(pool['multiattach'])
++ self.assertFalse(pool['multiattach'])
+ self.assertFalse(pool['QoS_support'])
+ self.assertFalse(pool['thick_provisioning_support'])
+ self.assertTrue(pool['thin_provisioning_support'])
@@ -644,3 +942,136 @@ class StorPoolTestCase(test.TestCase):
self.driver.get_pool({
'volume_type': volume_type
@@ -541,7 +550,7 @@
+ volumeName(fconst.VOLUME_ID),
+ )
diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index b15a201c3..ba5aa10c3 100644
+index b15a201c3..d8c420a66 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -15,6 +15,7 @@
@@ -974,7 +983,7 @@
'free_capacity_gb': free / units.Gi,
'reserved_percentage': 0,
- 'multiattach': True,
-+ 'multiattach': not self._use_iscsi,
++ 'multiattach': self._use_iscsi,
'QoS_support': False,
'thick_provisioning_support': False,
'thin_provisioning_support': True,
@@ -1078,10 +1087,10 @@
diff --git a/releasenotes/notes/storpool-iscsi-cefcfe590a07c5c7.yaml b/releasenotes/notes/storpool-iscsi-cefcfe590a07c5c7.yaml
new file mode 100644
-index 000000000..c48686abb
+index 000000000..edf46d298
--- /dev/null
+++ b/releasenotes/notes/storpool-iscsi-cefcfe590a07c5c7.yaml
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,13 @@
+---
+features:
+ - |
@@ -1092,6 +1101,9 @@
+ the Cinder documentation for more information on the ``iscsi_export_to``,
+ ``iscsi_portal_group``, ``iscsi_cinder_volume``, and
+ ``iscsi_learn_initiator_iqns`` options.
++ Note that multiattach support for StorPool is now only enabled if
++ ``iscsi_export_to`` is set to ``*`, that is, all StorPool volumes will be
++ exported via iSCSI to all initiators.
--
-2.40.1
+2.42.0