summaryrefslogtreecommitdiffstats
path: root/nova/volume
diff options
context:
space:
mode:
authorJohn Griffith <john.griffith@solidfire.com>2012-09-20 17:41:37 -0600
committerJohn Griffith <john.griffith@solidfire.com>2012-09-20 17:42:08 -0600
commita512a57cb3a6321a337ce8fb2607b2ac577bd6d3 (patch)
tree0d0ab3dec0856f462d0ff491e8fd3a8f6b9b2d57 /nova/volume
parent48fc829da2b2ca1106a59517d6df322fe7ba9d38 (diff)
downloadnova-a512a57cb3a6321a337ce8fb2607b2ac577bd6d3.tar.gz
nova-a512a57cb3a6321a337ce8fb2607b2ac577bd6d3.tar.xz
nova-a512a57cb3a6321a337ce8fb2607b2ac577bd6d3.zip
Add lun number (0) to model_update in HpSanDriver
The HpSanDriver was not setting the lun number in model_update and as a result default value of 1 was being used. Trouble is the Lun number used by LeftHand is 0, so the connect info would be wrong and fail when trying to attach the volume. Fixes bug #1053717 Change-Id: I2391db062dff35365030e33c3eb0569fdd397949
Diffstat (limited to 'nova/volume')
-rw-r--r--nova/volume/san.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/volume/san.py b/nova/volume/san.py
index d604cfffd..81cd5a49f 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -579,9 +579,12 @@ class HpSanISCSIDriver(SanISCSIDriver):
iscsi_portal = cluster_vip + ":3260," + cluster_interface
model_update = {}
- model_update['provider_location'] = ("%s %s" %
+
+ # NOTE(jdg): LH volumes always at lun 0 ?
+ model_update['provider_location'] = ("%s %s %s" %
(iscsi_portal,
- iscsi_iqn))
+ iscsi_iqn,
+ 0))
return model_update