提交 6bf28f38 编写于 作者: J John Ferlan

docs: Add more iscsi-direct references to storage pages

Found that it was missing in formatstorage and had a few typos
in the storage driver page.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>
上级 d2edbec2
...@@ -19,14 +19,15 @@ ...@@ -19,14 +19,15 @@
a single attribute <code>type</code>, which is one of <code>dir</code>, a single attribute <code>type</code>, which is one of <code>dir</code>,
<code>fs</code>, <code>netfs</code>, <code>disk</code>, <code>fs</code>, <code>netfs</code>, <code>disk</code>,
<code>iscsi</code>, <code>logical</code>, <code>scsi</code> <code>iscsi</code>, <code>logical</code>, <code>scsi</code>
(all <span class="since">since 0.4.1</span>), <code>mpath</code> (all <span class="since">since 0.4.1</span>),
(<span class="since">since 0.7.1</span>), <code>rbd</code> <code>mpath</code> (<span class="since">since 0.7.1</span>),
(<span class="since">since 0.9.13</span>), <code>sheepdog</code> <code>rbd</code> (<span class="since">since 0.9.13</span>),
(<span class="since">since 0.10.0</span>), <code>sheepdog</code> (<span class="since">since 0.10.0</span>),
<code>gluster</code> (<span class="since">since <code>gluster</code> (<span class="since">since 1.2.0</span>),
1.2.0</span>), <code>zfs</code> (<span class="since">since <code>zfs</code> (<span class="since">since 1.2.8</span>),
1.2.8</span>) or <code>vstorage</code> (<span class="since">since <code>vstorage</code> (<span class="since">since 3.1.0</span>),
3.1.0</span>). This corresponds to the or <code>iscsi-direct</code> (<span class="since">since 4.7.0</span>).
This corresponds to the
storage backend drivers listed further along in this document. storage backend drivers listed further along in this document.
</p> </p>
<h3><a id="StoragePoolFirst">General metadata</a></h3> <h3><a id="StoragePoolFirst">General metadata</a></h3>
...@@ -125,11 +126,12 @@ ...@@ -125,11 +126,12 @@
<dt><code>device</code></dt> <dt><code>device</code></dt>
<dd>Provides the source for pools backed by physical devices <dd>Provides the source for pools backed by physical devices
(pool types <code>fs</code>, <code>logical</code>, <code>disk</code>, (pool types <code>fs</code>, <code>logical</code>, <code>disk</code>,
<code>iscsi</code>, <code>zfs</code>, <code>vstorage</code>). <code>iscsi</code>, <code>iscsi-direct</code>, <code>zfs</code>,
<code>vstorage</code>).
May be repeated multiple times depending on backend driver. Contains May be repeated multiple times depending on backend driver. Contains
a required attribute <code>path</code> which is either the fully a required attribute <code>path</code> which is either the fully
qualified path to the block device node or for <code>iscsi</code> qualified path to the block device node or for <code>iscsi</code>
the iSCSI Qualified Name (IQN). or <code>iscsi-direct</code> the iSCSI Qualified Name (IQN).
<span class="since">Since 0.4.1</span> <span class="since">Since 0.4.1</span>
<p>An optional attribute <code>part_separator</code> for each <p>An optional attribute <code>part_separator</code> for each
<code>path</code> may be supplied. Valid values for the attribute <code>path</code> may be supplied. Valid values for the attribute
...@@ -334,6 +336,7 @@ ...@@ -334,6 +336,7 @@
<dt><code>host</code></dt> <dt><code>host</code></dt>
<dd>Provides the source for pools backed by storage from a <dd>Provides the source for pools backed by storage from a
remote server (pool types <code>netfs</code>, <code>iscsi</code>, remote server (pool types <code>netfs</code>, <code>iscsi</code>,
<code>iscsi-direct</code>,
<code>rbd</code>, <code>sheepdog</code>, <code>gluster</code>). Will be <code>rbd</code>, <code>sheepdog</code>, <code>gluster</code>). Will be
used in combination with a <code>directory</code> used in combination with a <code>directory</code>
or <code>device</code> element. Contains an attribute <code>name</code> or <code>device</code> element. Contains an attribute <code>name</code>
...@@ -348,11 +351,19 @@ ...@@ -348,11 +351,19 @@
server. See the <a href="storage.html">storage driver page</a> for server. See the <a href="storage.html">storage driver page</a> for
any restrictions for specific storage backends. any restrictions for specific storage backends.
<span class="since">Since 0.4.1</span></dd> <span class="since">Since 0.4.1</span></dd>
<dt><code>initiator</code></dt>
<dd>Required by the <code>iscsi-direct</code> pool in order to provide
the iSCSI Qualified Name (IQN) to communicate with the pool's
<code>device</code> target IQN. There is one sub-element
<code>iqn</code> with the <code>name</code> attribute to describe
the IQN for the initiator.
<span class="since">Since 4.7.0</span></dd>
<dt><code>auth</code></dt> <dt><code>auth</code></dt>
<dd>If present, the <code>auth</code> element provides the <dd>If present, the <code>auth</code> element provides the
authentication credentials needed to access the source by the authentication credentials needed to access the source by the
setting of the <code>type</code> attribute (pool setting of the <code>type</code> attribute (pool
types <code>iscsi</code>, <code>rbd</code>). The <code>type</code> types <code>iscsi</code>, <code>iscsi-direct</code>, <code>rbd</code>).
The <code>type</code>
must be either "chap" or "ceph". Use "ceph" for must be either "chap" or "ceph". Use "ceph" for
Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP
(Challenge-Handshake Authentication Protocol) iSCSI (Challenge-Handshake Authentication Protocol) iSCSI
......
...@@ -437,9 +437,9 @@ ...@@ -437,9 +437,9 @@
<h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2> <h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2>
<p> <p>
This is a variant of the iSCSI pool. Instead of unsing iscsiadm, it uses This is a variant of the iSCSI pool. Instead of using iscsiadm, it uses
libiscsi. libiscsi.
It require a host, a path which is the target iqn and an initiator iqn. It requires a host, a path which is the target IQN, and an initiator IQN.
</p> </p>
<h3>Example pool input</h3> <h3>Example pool input</h3>
...@@ -457,12 +457,12 @@ ...@@ -457,12 +457,12 @@
<h3>Valid pool format types</h3> <h3>Valid pool format types</h3>
<p> <p>
The iSCSI volume pool does not use the pool format type element. The iSCSI direct volume pool does not use the pool format type element.
</p> </p>
<h3>Valid volume format types</h3> <h3>Valid volume format types</h3>
<p> <p>
The iSCSI volume pool does not use the volume format type element. The iSCSI direct volume pool does not use the volume format type element.
</p> </p>
<h2><a id="StorageBackendSCSI">SCSI pool</a></h2> <h2><a id="StorageBackendSCSI">SCSI pool</a></h2>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册