diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dce75078fd..901c26a779 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1594,18 +1594,17 @@ <host name='example.com' port='3260'/> </source> <auth username='myuser'> - <secret type='chap' usage='libvirtiscsi'/> + <secret type='iscsi' usage='libvirtiscsi'/> </auth> <target dev='vda' bus='virtio'/> </disk> <disk type='network' device='lun'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/1'> - iqn.2013-07.com.example:iscsi-pool <host name='example.com' port='3260'/> </source> <auth username='myuser'> - <secret type='chap' usage='libvirtiscsi'/> + <secret type='iscsi' usage='libvirtiscsi'/> </auth> <target dev='sda' bus='scsi'/> </disk> @@ -1613,7 +1612,7 @@ <driver name='qemu' type='raw'/> <source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/> <auth username='myuser'> - <secret type='chap' usage='libvirtiscsi'/> + <secret type='iscsi' usage='libvirtiscsi'/> </auth> <target dev='vda' bus='virtio'/> </disk> @@ -1621,7 +1620,7 @@ <driver name='qemu' type='raw'/> <source pool='iscsi-pool' volume='unit:0:0:2' mode='direct'/> <auth username='myuser'> - <secret type='chap' usage='libvirtiscsi'/> + <secret type='iscsi' usage='libvirtiscsi'/> </auth> <target dev='vda' bus='virtio'/> </disk> @@ -2180,7 +2179,10 @@ are available, each defaulting to 0.
auth
auth
element provides the
+ auth
element is supported for a disk
+ type
"network" that is using a source
+ element with the protocol
attributes "rbd" or "iscsi".
+ If present, the auth
element provides the
authentication credentials needed to access the source. It
includes a mandatory attribute username
, which
identifies the username to use during authentication, as well
@@ -2189,11 +2191,11 @@
a libvirt secret object that
holds the actual password or other credentials (the domain XML
intentionally does not expose the password, only the reference
- to the object that does manage the password). For now, the
- known secret type
s are "ceph", for Ceph RBD
- network sources, and "iscsi", for CHAP authentication of iSCSI
- targets. Both require either a uuid
attribute
- with the UUID of the secret object, or a usage
+ to the object that does manage the password).
+ Known secret types are "ceph" for Ceph RBD network sources and
+ "iscsi" for CHAP authentication of iSCSI targets.
+ Both will require either a uuid
attribute
+ with the UUID of the secret object or a usage
attribute matching the key that was specified in the
secret object. libvirt 0.9.7