Merge "Add description in ProphetStor cinder volume driver"

doc/common/tables/cinder-prophetstor_dpl.xml

@@ -41,6 +41,10 @@
         <td>san_thin_provision = True</td>
         <td>(BoolOpt) Use thin provisioning for SAN volumes?</td>
       </tr>
+      <tr>
+        <td>iscsi_port = 3260</td>
+        <td>(IntOpt) The port that the iSCSI daemon is listening on</td>
+      </tr>
     </tbody>
   </table>
 </para>

doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml

@@ -4,6 +4,12 @@
          version="5.0"
          xml:id="prophetstor-dpl-driver">
     <title>ProphetStor Fibre Channel and iSCSI drivers</title>
+    <para>ProhetStor Fibre Channel and iSCSI drivers add support for
+        ProphetStor Flexvisor through OpenStack Block Storage. ProphetStor
+        Flexvisor enables commodity x86 hardware as software-defined storage
+        leveraging well-proven ZFS for disk management to provide enterprise
+        grade storage services such as snapshots, data protection with
+        different RAID levels, replication, and deduplication.</para>
     <para>The <literal>DPLFCDriver</literal> and
         <literal>DPLISCSIDriver</literal> drivers run
         volume operations by communicating with the ProphetStor storage
@@ -79,6 +85,9 @@ san_password=<replaceable>PASSWORD</replaceable>
 # Use thin provisioning for SAN volumes? (boolean value)
 san_thin_provision=true
 
+# The port that the iSCSI daemon is listening on. (integer value)
+iscsi_port=3260
+
 # DPL pool uuid in which DPL volumes are stored. (string value)
 dpl_pool=d5bd40b58ea84e9da09dcf25a01fdc07
 

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -154,7 +154,7 @@ iscsi_initiators emc
 iscsi_iotype storage
 iscsi_ip_address storage
 iscsi_num_targets storage
-iscsi_port storage
+iscsi_port storage prophetstor_dpl
 iscsi_target_prefix storage
 iscsi_write_cache storage
 iser_helper storage