diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 59624575d8..03a0e6e92f 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -106,12 +106,15 @@ volume_opts = [ help='Path to a Quobyte Client configuration file.'), cfg.StrOpt('iscsi_iface', deprecated_name='iscsi_transport', - choices=('be2iscsi', 'bnx2i', 'cxgb3i', 'cxgb4i', 'qla4xxx', - 'ocs'), help='The iSCSI transport iface to use to connect to target in ' - 'case offload support is desired. Default format is ' - 'transport_name.hwaddress and can be generated manually ' - 'or via iscsiadm -m iface'), + '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.'), # iser is also supported, but use LibvirtISERVolumeDriver # instead ]