Regenerate the cinder config tables

Change-Id: Ic738535898aac109ccf776070124ceb930337b4f

doc/common/tables/cinder-netapp_7mode_nfs.xml

@@ -55,7 +55,7 @@
       </tr>
       <tr>
         <td><option>netapp_vfiler</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) The vFiler unit on which provisioning of block storage volumes will be done. This option is only used by the driver when connecting to an instance with a storage family of Data ONTAP operating in 7-Mode and the storage protocol selected is NFS. Only use this option when utilizing the MultiStore feature on the NetApp storage system.</td>
+        <td>(StrOpt) The vFiler unit on which provisioning of block storage volumes will be done. This option is only used by the driver when connecting to an instance with a storage family of Data ONTAP operating in 7-Mode. Only use this option when utilizing the MultiStore feature on the NetApp storage system.</td>
       </tr>
       <tr>
         <td><option>thres_avl_size_perc_start</option> = <replaceable>20</replaceable></td>

doc/common/tables/cinder-quobyte.xml

@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_cinder_quobyte">
-    <caption>Description of quobyte configuration options</caption>
+    <caption>Description of Quobyte USP volume driver configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>

doc/common/tables/cinder-zfssa-nfs.xml

@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+  <!-- Warning: Do not edit this file. It is automatically
+     generated and your changes will be overwritten.
+     The tool to do so lives in openstack-doc-tools repository. -->
+  <table rules="all" xml:id="config_table_cinder_zfssa-nfs">
+    <caption>Description of ZFS Storage Appliance NFS driver configuration options</caption>
+    <col width="50%"/>
+    <col width="50%"/>
+    <thead>
+      <tr>
+        <th>Configuration option = Default value</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th colspan="2">[DEFAULT]</th>
+      </tr>
+      <tr>
+        <td><option>zfssa_data_ip</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) Data path IP address</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_https_port</option> = <replaceable>443</replaceable></td>
+        <td>(StrOpt) HTTPS port number</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_mount_options</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Options to be passed while mounting share over nfs</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_pool</option> = <replaceable></replaceable></td>
+        <td>(StrOpt) Storage pool name.</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_project</option> = <replaceable>NFSProject</replaceable></td>
+        <td>(StrOpt) Project name.</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_share</option> = <replaceable>nfs_share</replaceable></td>
+        <td>(StrOpt) Share name.</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_share_compression</option> = <replaceable>off</replaceable></td>
+        <td>(StrOpt) Data compression-off, lzjb, gzip-2, gzip, gzip-9.</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_nfs_share_logbias</option> = <replaceable>latency</replaceable></td>
+        <td>(StrOpt) Synchronous write bias-latency, throughput.</td>
+      </tr>
+      <tr>
+        <td><option>zfssa_rest_timeout</option> = <replaceable>None</replaceable></td>
+        <td>(IntOpt) REST connection timeout. (seconds)</td>
+      </tr>
+    </tbody>
+  </table>
+</para>

doc/common/tables/cinder-zfssa.xml

@@ -17,14 +17,6 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
-      <tr>
-        <td><option>zfssa_data_ip</option> = <replaceable>None</replaceable></td>
-        <td>(StrOpt) Data path IP address</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_https_port</option> = <replaceable>443</replaceable></td>
-        <td>(StrOpt) HTTPS port number</td>
-      </tr>
       <tr>
         <td><option>zfssa_initiator</option> = <replaceable></replaceable></td>
         <td>(StrOpt) iSCSI initiator IQNs. (comma separated)</td>
@@ -61,30 +53,6 @@
         <td><option>zfssa_lun_volblocksize</option> = <replaceable>8k</replaceable></td>
         <td>(StrOpt) Block size: 512, 1k, 2k, 4k, 8k, 16k, 32k, 64k, 128k.</td>
       </tr>
-      <tr>
-        <td><option>zfssa_nfs_mount_options</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) Options to be passed while mounting share over nfs</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_nfs_pool</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) Storage pool name.</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_nfs_project</option> = <replaceable>NFSProject</replaceable></td>
-        <td>(StrOpt) Project name.</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_nfs_share</option> = <replaceable>nfs_share</replaceable></td>
-        <td>(StrOpt) Share name.</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_nfs_share_compression</option> = <replaceable>off</replaceable></td>
-        <td>(StrOpt) Data compression-off, lzjb, gzip-2, gzip, gzip-9.</td>
-      </tr>
-      <tr>
-        <td><option>zfssa_nfs_share_logbias</option> = <replaceable>latency</replaceable></td>
-        <td>(StrOpt) Synchronous write bias-latency, throughput.</td>
-      </tr>
       <tr>
         <td><option>zfssa_pool</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) Storage pool name.</td>