diff --git a/doc/source/admin/glusterfs_driver.rst b/doc/source/admin/glusterfs_driver.rst index 135cd255f5..ee0a050f69 100644 --- a/doc/source/admin/glusterfs_driver.rst +++ b/doc/source/admin/glusterfs_driver.rst @@ -20,6 +20,9 @@ GlusterFS driver GlusterFS driver uses GlusterFS, an open source distributed file system, as the storage backend for serving file shares to manila clients. +.. note:: + This driver has been deprecated in 18.0.0 release. + Supported shared filesystems ---------------------------- diff --git a/doc/source/admin/glusterfs_native_driver.rst b/doc/source/admin/glusterfs_native_driver.rst index 9632c04dd1..95bfd0ac0d 100644 --- a/doc/source/admin/glusterfs_native_driver.rst +++ b/doc/source/admin/glusterfs_native_driver.rst @@ -27,6 +27,9 @@ shares. Access to each share is allowed via TLS Certificates. Only the instance which has the TLS trust established with the GlusterFS backend can mount and hence use the share. Currently only 'rw' access is supported. +.. note:: + This driver has been deprecated in 18.0.0 release. + Network Approach ---------------- diff --git a/doc/source/configuration/shared-file-systems/drivers/glusterfs-driver.rst b/doc/source/configuration/shared-file-systems/drivers/glusterfs-driver.rst index 557f6355c1..b1940b025a 100644 --- a/doc/source/configuration/shared-file-systems/drivers/glusterfs-driver.rst +++ b/doc/source/configuration/shared-file-systems/drivers/glusterfs-driver.rst @@ -6,6 +6,9 @@ GlusterFS driver uses GlusterFS, an open source distributed file system, as the storage back end for serving file shares to the Shared File Systems clients. +.. note:: + This driver has been deprecated in 18.0.0 release. + Supported shared filesystems and operations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/configuration/shared-file-systems/drivers/glusterfs-native-driver.rst b/doc/source/configuration/shared-file-systems/drivers/glusterfs-native-driver.rst index 1b47402e4b..1598e9ba64 100644 --- a/doc/source/configuration/shared-file-systems/drivers/glusterfs-native-driver.rst +++ b/doc/source/configuration/shared-file-systems/drivers/glusterfs-native-driver.rst @@ -14,6 +14,9 @@ via TLS Certificates. Only the instance which has the TLS trust established with the GlusterFS back end can mount and hence use the share. Currently only ``read-write (rw)`` access is supported. +.. note:: + This driver has been deprecated in 18.0.0 release. + Network approach ~~~~~~~~~~~~~~~~ diff --git a/manila/share/drivers/glusterfs/__init__.py b/manila/share/drivers/glusterfs/__init__.py index 1b0ec02ffd..7b6e7590a5 100644 --- a/manila/share/drivers/glusterfs/__init__.py +++ b/manila/share/drivers/glusterfs/__init__.py @@ -29,6 +29,7 @@ import socket import sys from oslo_config import cfg +from oslo_log import log from manila.common import constants from manila import exception @@ -60,6 +61,9 @@ GlusterfsManilaShare_opts = [ CONF = cfg.CONF CONF.register_opts(GlusterfsManilaShare_opts) +LOG = log.getLogger(__name__) + + NFS_EXPORT_DIR = 'nfs.export-dir' NFS_EXPORT_VOL = 'nfs.export-volumes' NFS_RPC_AUTH_ALLOW = 'nfs.rpc-auth-allow' @@ -78,6 +82,8 @@ class GlusterfsShareDriver(driver.ExecuteMixin, driver.GaneshaMixin, def __init__(self, *args, **kwargs): super(GlusterfsShareDriver, self).__init__(False, *args, **kwargs) + LOG.warning('GlusterFS share driver has been deprecated and is ' + 'expected to be removed in a future release.') self._helpers = {} self.configuration.append_config_values(GlusterfsManilaShare_opts) self.backend_name = self.configuration.safe_get( diff --git a/manila/share/drivers/glusterfs/glusterfs_native.py b/manila/share/drivers/glusterfs/glusterfs_native.py index 9b5760e0fd..be02643a3c 100644 --- a/manila/share/drivers/glusterfs/glusterfs_native.py +++ b/manila/share/drivers/glusterfs/glusterfs_native.py @@ -71,6 +71,8 @@ class GlusterfsNativeShareDriver(driver.ExecuteMixin, def __init__(self, *args, **kwargs): super(GlusterfsNativeShareDriver, self).__init__( False, *args, **kwargs) + LOG.warning('GlusterFS native share driver has been deprecated and is ' + 'expected to be removed in a future release.') self._helpers = None self.backend_name = self.configuration.safe_get( 'share_backend_name') or 'GlusterFS-Native' diff --git a/releasenotes/notes/deprecate-glustefs-8e0c863aaa58eb6b.yaml b/releasenotes/notes/deprecate-glustefs-8e0c863aaa58eb6b.yaml new file mode 100644 index 0000000000..855f88d909 --- /dev/null +++ b/releasenotes/notes/deprecate-glustefs-8e0c863aaa58eb6b.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The GlusterFS driver the GlusterFS Native driver have been deprecated. + These drivers will be removed in a future release.