summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-29 20:43:58 +0000
committerGerrit Code Review <review@openstack.org>2012-02-29 20:43:58 +0000
commitcc2083ba45365071a459643a3e43085d15672538 (patch)
tree8c675783e6e1c35e9a2cfb76651a9eccd002fe15
parent09e664c0f00326d3dea8c04ac661ca0a05bbf0f5 (diff)
parentf7f15f10691c1eb7921e8f998b0b9b264b0c8d5f (diff)
downloadnova-cc2083ba45365071a459643a3e43085d15672538.tar.gz
Merge "Add lun number to provider_location in create_volume * Fixes bug 938876" into milestone-proposed
-rw-r--r--nova/volume/san.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/volume/san.py b/nova/volume/san.py
index b76f224d56..80ca883859 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -837,7 +837,10 @@ class SolidFireSanISCSIDriver(SanISCSIDriver):
break
model_update = {}
- model_update['provider_location'] = ('%s %s' % (iscsi_portal, iqn))
+
+ # NOTE(john-griffith): SF volumes are always at lun 0
+ model_update['provider_location'] = ('%s %s %s'
+ % (iscsi_portal, iqn, 0))
model_update['provider_auth'] = ('CHAP %s %s'
% (account_name, chap_secret))