Permalink
Browse files

libvirt : remove broken olso_config choices option

Changeset ed9f1b8 restricted the allowed options for iscsi_iface
to the allowed transports mentioned in the help text. iface &
transport are distinct entities for open-iscsi, and an iface is
generally a mix of transport plus an underlying interface, hence
this change was incorrect. This breaks transport support and is
generally incorrect, hence reverting

Closes-Bug:1466730
Change-Id: I687fb9c95133dbbb193004df44794404b58ca692
  • Loading branch information...
anish committed Jun 19, 2015
1 parent 275c9ac commit 66b9c2ceaea3decc117cfe7d326a92bf2bdd169b
Showing with 8 additions and 5 deletions.
  1. +8 −5 nova/virt/libvirt/volume.py
@@ -106,12 +106,15 @@
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 <transport_name>.<hwaddress> where '
'<transport_name> is one of (be2iscsi, bnx2i, cxgb3i, '
'cxgb4i, qla4xxx, ocs) and <hwadress> 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
]

0 comments on commit 66b9c2c

Please sign in to comment.