diff options
| author | John Griffith <john.griffith@solidfire.com> | 2012-09-20 17:41:37 -0600 |
|---|---|---|
| committer | John Griffith <john.griffith@solidfire.com> | 2012-09-20 17:42:08 -0600 |
| commit | a512a57cb3a6321a337ce8fb2607b2ac577bd6d3 (patch) | |
| tree | 0d0ab3dec0856f462d0ff491e8fd3a8f6b9b2d57 /nova | |
| parent | 48fc829da2b2ca1106a59517d6df322fe7ba9d38 (diff) | |
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')
| -rw-r--r-- | nova/tests/volume/test_HpSanISCSIDriver.py | 2 | ||||
| -rw-r--r-- | nova/volume/san.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nova/tests/volume/test_HpSanISCSIDriver.py b/nova/tests/volume/test_HpSanISCSIDriver.py index b3656bb22..6c9ca8a87 100644 --- a/nova/tests/volume/test_HpSanISCSIDriver.py +++ b/nova/tests/volume/test_HpSanISCSIDriver.py @@ -175,7 +175,7 @@ class HpSanISCSITestCase(test.TestCase): def test_create_volume(self): volume = {'name': self.volume_name, 'size': 1} model_update = self.driver.create_volume(volume) - expected_iqn = "iqn.2003-10.com.lefthandnetworks:group01:25366:fakev" + expected_iqn = "iqn.2003-10.com.lefthandnetworks:group01:25366:fakev 0" expected_location = "10.0.1.6:3260,1 %s" % expected_iqn self.assertEqual(model_update['provider_location'], expected_location) 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 |