From 0de9a80532cf96bcd1f29647aeadd01d9a7196da Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Thu, 27 Apr 2017 13:21:04 +0900 Subject: [PATCH] [config-ref] Remove GlusterFS volume driver backport: ocata Change-Id: Id9b7507d932eb662c60cddeab40790125c24d09a Closes-Bug: #1686379 --- .../drivers/glusterfs-driver.rst | 22 ------------------- .../source/block-storage/volume-drivers.rst | 1 - .../source/tables/cinder-nas.rst | 2 ++ .../tables/cinder-storage_glusterfs.rst | 22 ------------------- .../cinder.flagmappings | 2 +- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 doc/config-reference/source/block-storage/drivers/glusterfs-driver.rst delete mode 100644 doc/config-reference/source/tables/cinder-storage_glusterfs.rst diff --git a/doc/config-reference/source/block-storage/drivers/glusterfs-driver.rst b/doc/config-reference/source/block-storage/drivers/glusterfs-driver.rst deleted file mode 100644 index 7395b71780..0000000000 --- a/doc/config-reference/source/block-storage/drivers/glusterfs-driver.rst +++ /dev/null @@ -1,22 +0,0 @@ -================ -GlusterFS driver -================ - -GlusterFS is an open-source scalable distributed file system that is able -to grow to petabytes and beyond in size. More information can be found on -`Gluster's homepage `_. - -This driver enables the use of GlusterFS in a similar fashion as NFS. -It supports basic volume operations, including snapshot and clone. - -To use Block Storage with GlusterFS, first set the ``volume_driver`` in -the ``cinder.conf`` file: - -.. code-block:: ini - - volume_driver = cinder.volume.drivers.glusterfs.GlusterfsDriver - -The following table contains the configuration options supported by -the GlusterFS driver. - -.. include:: ../../tables/cinder-storage_glusterfs.rst diff --git a/doc/config-reference/source/block-storage/volume-drivers.rst b/doc/config-reference/source/block-storage/volume-drivers.rst index e5b449dc40..ce59d1f24c 100644 --- a/doc/config-reference/source/block-storage/volume-drivers.rst +++ b/doc/config-reference/source/block-storage/volume-drivers.rst @@ -9,7 +9,6 @@ Volume drivers :maxdepth: 1 drivers/ceph-rbd-volume-driver.rst - drivers/glusterfs-driver.rst drivers/lvm-volume-driver.rst drivers/nfs-volume-driver.rst drivers/sheepdog-driver.rst diff --git a/doc/config-reference/source/tables/cinder-nas.rst b/doc/config-reference/source/tables/cinder-nas.rst index 6c6a34bcba..4dcfa2da5f 100644 --- a/doc/config-reference/source/tables/cinder-nas.rst +++ b/doc/config-reference/source/tables/cinder-nas.rst @@ -36,3 +36,5 @@ - (String) Path to the share to use for storing Cinder volumes. For example: "/srv/export1" for an NFS server export available at 10.0.5.10:/srv/export1 . * - ``nas_ssh_port`` = ``22`` - (Port number) SSH port to use to connect to NAS system. + * - ``nas_volume_prov_type`` = ``thin`` + - (String) Provisioning type that will be used when creating volumes. diff --git a/doc/config-reference/source/tables/cinder-storage_glusterfs.rst b/doc/config-reference/source/tables/cinder-storage_glusterfs.rst deleted file mode 100644 index 6c997a21c6..0000000000 --- a/doc/config-reference/source/tables/cinder-storage_glusterfs.rst +++ /dev/null @@ -1,22 +0,0 @@ -.. - Warning: Do not edit this file. It is automatically generated from the - software project's code and your changes will be overwritten. - - The tool to generate this file lives in openstack-doc-tools repository. - - Please make any changes needed in the code, then run the - autogenerate-config-doc tool from the openstack-doc-tools repository, or - ask for help on the documentation mailing list, IRC channel or meeting. - -.. _cinder-storage_glusterfs: - -.. list-table:: Description of GlusterFS storage configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``nas_volume_prov_type`` = ``thin`` - - (String) Provisioning type that will be used when creating volumes. diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 2319772887..d898bcac17 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -405,7 +405,7 @@ nas_secure_file_operations nas nas_secure_file_permissions nas nas_share_path nas nas_ssh_port nas storage_gpfs -nas_volume_prov_type storage_glusterfs +nas_volume_prov_type nas naviseccli_path emc nec_actual_free_capacity nec_m nec_backend_max_ld_count nec_m