diff --git a/cinder/volume/drivers/zfssa/zfssaiscsi.py b/cinder/volume/drivers/zfssa/zfssaiscsi.py index 5a8d540ef39..2d3fe5bc33d 100644 --- a/cinder/volume/drivers/zfssa/zfssaiscsi.py +++ b/cinder/volume/drivers/zfssa/zfssaiscsi.py @@ -128,6 +128,10 @@ class ZFSSAISCSIDriver(driver.ISCSIDriver): VERSION = '1.0.4' protocol = 'iSCSI' + # TODO(jsbryant) Remove driver in the 'U' release as Oracle + # is dropping support. + SUPPORTED = False + # ThirdPartySystems wiki page CI_WIKI_NAME = "Oracle_ZFSSA_CI" diff --git a/cinder/volume/drivers/zfssa/zfssanfs.py b/cinder/volume/drivers/zfssa/zfssanfs.py index 96b4beccff6..e554c6f8fb1 100644 --- a/cinder/volume/drivers/zfssa/zfssanfs.py +++ b/cinder/volume/drivers/zfssa/zfssanfs.py @@ -101,6 +101,10 @@ class ZFSSANFSDriver(nfs.NfsDriver): # ThirdPartySystems wiki page CI_WIKI_NAME = "Oracle_ZFSSA_CI" + # TODO(jsbryant) Remove driver in the 'U' release as Oracle + # is dropping support. + SUPPORTED = False + def __init__(self, *args, **kwargs): super(ZFSSANFSDriver, self).__init__(*args, **kwargs) self.configuration.append_config_values(ZFSSA_OPTS) diff --git a/doc/source/reference/support-matrix.ini b/doc/source/reference/support-matrix.ini index ecf2ed3896c..51cee9056e4 100644 --- a/doc/source/reference/support-matrix.ini +++ b/doc/source/reference/support-matrix.ini @@ -248,7 +248,7 @@ driver.netapp_solidfire=complete driver.nexenta=complete driver.nfs=complete driver.nimble=missing -driver.oracle_zfssa=complete +driver.oracle_zfssa=missing driver.prophetstor=missing driver.pure=complete driver.qnap=complete diff --git a/releasenotes/notes/oracle-zfssa-unsupported-4ce035213fa0e097.yaml b/releasenotes/notes/oracle-zfssa-unsupported-4ce035213fa0e097.yaml new file mode 100644 index 00000000000..e90bc747bef --- /dev/null +++ b/releasenotes/notes/oracle-zfssa-unsupported-4ce035213fa0e097.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + The Oracle ZFSSA drivers have been marked as unsupported + and are now deprecated. ``enable_unsupported_driver`` will need + to be set to ``True`` in the driver's section in cinder.conf to + continue to use them. +deprecations: + - | + The Oracle ZFSSA drivers has been marked as unsupported + and are now deprecated. ``enable_unsupported_driver`` will need + to be set to ``True`` in the driver's section in cinder.conf to + continue to use them. Oracle has indicated that they don't plan to + continue to support the drivers so they will be removed in + the 'U' development cycle.