aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-05 14:42:25 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-05 14:42:25 +0000
commit05eacf31fd50202e44a4e6a3a2faf0402ee97b71 (patch)
tree5808c8dbedc99d2fa12f9e9430cf670515d10c2c
parenteccb4696e8b0dfbe12b7983d0ef1bae61aa5f173 (diff)
downloadxen-05eacf31fd50202e44a4e6a3a2faf0402ee97b71.tar.gz
xen-05eacf31fd50202e44a4e6a3a2faf0402ee97b71.tar.bz2
xen-05eacf31fd50202e44a4e6a3a2faf0402ee97b71.zip
xend: XenAPI does not support pvSCSI multipath
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
-rw-r--r--tools/python/xen/xend/XendNode.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index 6541b63f54..fa3cba1944 100644
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -333,7 +333,11 @@ class XendNode:
pscsi_uuid = uuid.createString()
saved_pscsi_table[scsi_id] = pscsi_uuid
else:
- saved_HBA_uuid = saved_pscsis[pscsi_uuid].get('HBA', None)
+ try:
+ saved_HBA_uuid = saved_pscsis[pscsi_uuid].get('HBA', None)
+ except KeyError:
+ log.warn("Multi-path SCSI devices are not supported for XenAPI")
+ return
physical_host = int(pscsi_record['physical_HCTL'].split(':')[0])
if pscsi_HBA_table.has_key(physical_host):