exp: erm, regenerate the iSCSI patch
Change-Id: I840302685b69f3343e137d85f70d9ecf36350e1c
diff --git a/patches/openstack/cinder/sep-sp-iscsi.patch b/patches/openstack/cinder/sep-sp-iscsi.patch
index dfbec0c..23117a6 100644
--- a/patches/openstack/cinder/sep-sp-iscsi.patch
+++ b/patches/openstack/cinder/sep-sp-iscsi.patch
@@ -30,11 +30,9 @@
.../drivers/storpool-volume-driver.rst | 49 ++-
3 files changed, 464 insertions(+), 9 deletions(-)
-diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py
-index 95a1ffffd..7e8a17800 100644
--- a/cinder/tests/unit/volume/drivers/test_storpool.py
+++ b/cinder/tests/unit/volume/drivers/test_storpool.py
-@@ -32,6 +32,7 @@ fakeStorPool.sptypes = mock.Mock()
+@@ -32,6 +32,7 @@
sys.modules['storpool'] = fakeStorPool
@@ -42,7 +40,7 @@
from cinder import exception
from cinder.tests.unit import test
from cinder.volume import configuration as conf
-@@ -222,7 +223,14 @@ class StorPoolTestCase(test.TestCase):
+@@ -222,7 +223,14 @@
self.cfg.volume_backend_name = 'storpool_test'
self.cfg.storpool_template = None
self.cfg.storpool_replication = 3
@@ -57,7 +55,7 @@
mock_exec = mock.Mock()
mock_exec.return_value = ('', '')
-@@ -231,7 +239,7 @@ class StorPoolTestCase(test.TestCase):
+@@ -231,7 +239,7 @@
self.driver.check_for_setup_error()
@ddt.data(
@@ -66,7 +64,7 @@
({'no-host': None}, KeyError),
({'host': 'sbad'}, driver.StorPoolConfigurationInvalid),
({'host': 's01'}, None),
-@@ -247,7 +255,7 @@ class StorPoolTestCase(test.TestCase):
+@@ -247,7 +255,7 @@
conn)
@ddt.data(
@@ -75,7 +73,7 @@
({'no-host': None}, KeyError),
({'host': 'sbad'}, driver.StorPoolConfigurationInvalid),
)
-@@ -644,3 +652,55 @@ class StorPoolTestCase(test.TestCase):
+@@ -644,3 +652,55 @@
self.driver.get_pool({
'volume_type': volume_type
}))
@@ -131,8 +129,6 @@
+ # look at the specified expected value.
+ check({"storpool_wants_iscsi": False}, use_iscsi, expected)
+ check({}, use_iscsi, expected)
-diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index 5aa30398e..07f61db20 100644
--- a/cinder/volume/drivers/storpool.py
+++ b/cinder/volume/drivers/storpool.py
@@ -15,6 +15,7 @@
@@ -143,7 +139,7 @@
import platform
from oslo_config import cfg
-@@ -44,6 +45,31 @@ if storpool:
+@@ -44,6 +45,31 @@
storpool_opts = [
@@ -175,7 +171,7 @@
cfg.StrOpt('storpool_template',
default=None,
help='The StorPool template for volumes with no type.'),
-@@ -105,6 +131,7 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -105,6 +131,7 @@
self._ourId = None
self._ourIdInt = None
self._attach = None
@@ -183,7 +179,7 @@
@staticmethod
def get_driver_options():
-@@ -162,10 +189,312 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -162,10 +189,326 @@
raise StorPoolConfigurationInvalid(
section=hostname, param='SP_OURID', error=e)
@@ -510,7 +506,7 @@
return {'driver_volume_type': 'storpool',
'data': {
'client_id': self._storpool_client_id(connector),
-@@ -174,6 +503,9 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -174,6 +517,9 @@
}}
def terminate_connection(self, volume, connector, **kwargs):
@@ -520,7 +516,7 @@
pass
def create_snapshot(self, snapshot):
-@@ -275,11 +607,20 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -275,11 +621,20 @@
)
def create_export(self, context, volume, connector):
@@ -542,7 +538,7 @@
def delete_volume(self, volume):
name = self._attach.volumeName(volume['id'])
try:
-@@ -316,6 +657,17 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -316,6 +671,17 @@
LOG.error("StorPoolDriver API initialization failed: %s", e)
raise
@@ -560,7 +556,7 @@
def _update_volume_stats(self):
try:
dl = self._attach.api().disksList()
-@@ -341,7 +693,7 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -341,7 +707,7 @@
'total_capacity_gb': total / units.Gi,
'free_capacity_gb': free / units.Gi,
'reserved_percentage': 0,
@@ -569,7 +565,7 @@
'QoS_support': False,
'thick_provisioning_support': False,
'thin_provisioning_support': True,
-@@ -359,7 +711,9 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -359,7 +725,9 @@
'volume_backend_name') or 'storpool',
'vendor_name': 'StorPool',
'driver_version': self.VERSION,
@@ -580,11 +576,9 @@
'clone_across_pools': True,
'sparse_copy_volume': True,
-diff --git a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
-index d2c5895a9..c891675bc 100644
--- a/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/storpool-volume-driver.rst
-@@ -19,12 +19,15 @@ Prerequisites
+@@ -19,12 +19,15 @@
* The controller and all the compute nodes must have access to the StorPool
API service.
@@ -604,7 +598,7 @@
* All nodes that need to access the StorPool API (the compute nodes and
the node running the ``cinder-volume`` service) must have the following
-@@ -34,6 +37,29 @@ Prerequisites
+@@ -34,6 +37,29 @@
* the storpool Python bindings package
* the storpool.spopenstack Python helper package
@@ -634,7 +628,7 @@
Configuring the StorPool volume driver
--------------------------------------
-@@ -55,6 +81,21 @@ volume backend definition) and per volume type:
+@@ -55,6 +81,21 @@
with the default placement constraints for the StorPool cluster.
The default value for the chain replication is 3.
@@ -656,6 +650,3 @@
Using the StorPool volume driver
--------------------------------
---
-2.39.0
-