diff --git a/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst b/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst index 2c8c20bfa97..71615f9f913 100644 --- a/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zfssa-iscsi-driver.rst @@ -262,4 +262,7 @@ Driver options The Oracle ZFSSA iSCSI Driver supports these options: -.. include:: ../../tables/cinder-zfssa-iscsi.inc +.. config-table:: + :config-target: ZFS Storage Appliance iSCSI + + cinder.volume.drivers.zfssa.zfssaiscsi diff --git a/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst b/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst index f987f1ef0d1..86da7884db2 100644 --- a/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst +++ b/doc/source/configuration/block-storage/drivers/zfssa-nfs-driver.rst @@ -291,7 +291,10 @@ Driver options The Oracle ZFS Storage Appliance NFS driver supports these options: -.. include:: ../../tables/cinder-zfssa-nfs.inc +.. config-table:: + :config-target: ZFS Storage Appliance NFS + + cinder.volume.drivers.zfssa.zfssanfs This driver shares additional NFS configuration options with the generic NFS driver. For a description of these, see :ref:`cinder-storage_nfs`. diff --git a/doc/source/configuration/tables/cinder-zfssa-iscsi.inc b/doc/source/configuration/tables/cinder-zfssa-iscsi.inc deleted file mode 100644 index a6b81d915b8..00000000000 --- a/doc/source/configuration/tables/cinder-zfssa-iscsi.inc +++ /dev/null @@ -1,56 +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-zfssa-iscsi: - -.. list-table:: Description of ZFS Storage Appliance iSCSI driver configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``zfssa_initiator`` = - - (String) iSCSI initiator IQNs. (comma separated) - * - ``zfssa_initiator_config`` = - - (String) iSCSI initiators configuration. - * - ``zfssa_initiator_group`` = - - (String) iSCSI initiator group. - * - ``zfssa_initiator_password`` = - - (String) Secret of the iSCSI initiator CHAP user. - * - ``zfssa_initiator_user`` = - - (String) iSCSI initiator CHAP user (name). - * - ``zfssa_lun_compression`` = ``off`` - - (String) Data compression. - * - ``zfssa_lun_logbias`` = ``latency`` - - (String) Synchronous write bias. - * - ``zfssa_lun_sparse`` = ``False`` - - (Boolean) Flag to enable sparse (thin-provisioned): True, False. - * - ``zfssa_lun_volblocksize`` = ``8k`` - - (String) Block size. - * - ``zfssa_pool`` = ``None`` - - (String) Storage pool name. - * - ``zfssa_project`` = ``None`` - - (String) Project name. - * - ``zfssa_replication_ip`` = - - (String) IP address used for replication data. (maybe the same as data ip) - * - ``zfssa_rest_timeout`` = ``None`` - - (Integer) REST connection timeout. (seconds) - * - ``zfssa_target_group`` = ``tgt-grp`` - - (String) iSCSI target group name. - * - ``zfssa_target_interfaces`` = ``None`` - - (String) Network interfaces of iSCSI targets. (comma separated) - * - ``zfssa_target_password`` = - - (String) Secret of the iSCSI target CHAP user. - * - ``zfssa_target_portal`` = ``None`` - - (String) iSCSI target portal (Data-IP:Port, w.x.y.z:3260). - * - ``zfssa_target_user`` = - - (String) iSCSI target CHAP user (name). diff --git a/doc/source/configuration/tables/cinder-zfssa-nfs.inc b/doc/source/configuration/tables/cinder-zfssa-nfs.inc deleted file mode 100644 index 623e514ac42..00000000000 --- a/doc/source/configuration/tables/cinder-zfssa-nfs.inc +++ /dev/null @@ -1,46 +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-zfssa-nfs: - -.. list-table:: Description of ZFS Storage Appliance NFS driver configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``zfssa_cache_directory`` = ``os-cinder-cache`` - - (String) Name of directory inside zfssa_nfs_share where cache volumes are stored. - * - ``zfssa_cache_project`` = ``os-cinder-cache`` - - (String) Name of ZFSSA project where cache volumes are stored. - * - ``zfssa_data_ip`` = ``None`` - - (String) Data path IP address - * - ``zfssa_enable_local_cache`` = ``True`` - - (Boolean) Flag to enable local caching: True, False. - * - ``zfssa_https_port`` = ``443`` - - (String) HTTPS port number - * - ``zfssa_manage_policy`` = ``loose`` - - (String) Driver policy for volume manage. - * - ``zfssa_nfs_mount_options`` = - - (String) Options to be passed while mounting share over nfs - * - ``zfssa_nfs_pool`` = - - (String) Storage pool name. - * - ``zfssa_nfs_project`` = ``NFSProject`` - - (String) Project name. - * - ``zfssa_nfs_share`` = ``nfs_share`` - - (String) Share name. - * - ``zfssa_nfs_share_compression`` = ``off`` - - (String) Data compression. - * - ``zfssa_nfs_share_logbias`` = ``latency`` - - (String) Synchronous write bias-latency, throughput. - * - ``zfssa_rest_timeout`` = ``None`` - - (Integer) REST connection timeout. (seconds)