File debug-iscsi-attach-failure.diff of Package openstack-nova-doc

Index: nova-2014.1.4.dev51/nova/virt/libvirt/volume.py
===================================================================
--- nova-2014.1.4.dev51.orig/nova/virt/libvirt/volume.py
+++ nova-2014.1.4.dev51/nova/virt/libvirt/volume.py
@@ -257,7 +257,7 @@ class LibvirtISCSIVolumeDriver(LibvirtBa
 
     def _get_target_portals_from_iscsiadm_output(self, output):
         # return both portals and iqns
-        return [line.split() for line in output.splitlines()]
+        return [line.split(None, 2) for line in output.splitlines()]
 
     @utils.synchronized('connect_volume')
     def connect_volume(self, connection_info, disk_info):
@@ -281,6 +281,8 @@ class LibvirtISCSIVolumeDriver(LibvirtBa
                                           check_exit_code=[0, 255])[0] \
                 or ""
 
+            LOG.warning("mulitpath discovery returned %(out)s", {'out': out})
+
             # There are two types of iSCSI multipath devices.  One which shares
             # the same iqn between multiple portals, and the other which use
             # different iqns on different portals.  Try to identify the type by