diff --git a/doc/source/admin/configuration/iscsi-offload.rst b/doc/source/admin/configuration/iscsi-offload.rst index ac477082eb..baa9a8bc1d 100644 --- a/doc/source/admin/configuration/iscsi-offload.rst +++ b/doc/source/admin/configuration/iscsi-offload.rst @@ -9,8 +9,8 @@ desired. Once an open-iscsi interface is configured, the iface name parameter for use. All iSCSI sessions will be bound to this iSCSI interface. Currently supported transports (``iface.transport_name``) are ``be2iscsi``, -``bnx2i``, ``cxgb3i``, ``cxgb4i``, ``qla4xxx``, ``ocs``. Configuration changes -are required on the compute node only. +``bnx2i``, ``cxgb3i``, ``cxgb4i``, ``qla4xxx``, ``ocs``, ``tcp``. Configuration +changes are required on the compute node only. iSER is supported using the separate iSER LibvirtISERVolumeDriver and will be rejected if used via the ``iscsi_iface`` parameter. diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index a15d2c8062..2b7ac12930 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -1027,11 +1027,12 @@ libvirt_volume_iscsi_opts = [ The iSCSI transport iface to use to connect to target in case offload support is desired. -Default format is of the form . where - is one of (be2iscsi, bnx2i, cxgb3i, cxgb4i, qla4xxx, ocs) and - is the MAC address of the interface and can be generated via the -iscsiadm -m iface command. Do not confuse the iscsi_iface parameter to be -provided here with the actual transport name. +Default format is of the form ``.``, where +```` is one of (``be2iscsi``, ``bnx2i``, ``cxgb3i``, +``cxgb4i``, ``qla4xxx``, ``ocs``, ``tcp``) and ```` is the MAC +address of the interface and can be generated via the ``iscsiadm -m iface`` +command. Do not confuse the ``iscsi_iface`` parameter to be provided here with +the actual transport name. """) # iser is also supported, but use LibvirtISERVolumeDriver # instead