From: John Griffith <john.griffith@solidfire.com>
Date: Fri, 7 Sep 2012 05:50:49 +0000 (-0600)
Subject: Update SolidFire driver to reflect IQN changes
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2d211b66994240b2047d78b3d084d52abeac72a2;p=openstack-build%2Fcinder-build.git

Update SolidFire driver to reflect IQN changes

 Prior to release the SolidFire device returned only
 a partial iqn string in it's api call.

 With the GA release, this was modified to return the entire
 iqn string, so just drop the prefix we were using in beta.

Change-Id: I7fa9d1ec6e2639149375a1115198eee90c527ef1
---

diff --git a/cinder/volume/solidfire.py b/cinder/volume/solidfire.py
index 132e924a5..70fbcab87 100644
--- a/cinder/volume/solidfire.py
+++ b/cinder/volume/solidfire.py
@@ -228,7 +228,7 @@ class SolidFire(SanISCSIDriver):
         iqn = None
         for v in volume_list:
             if v['volumeID'] == volume_id:
-                iqn = 'iqn.2010-01.com.solidfire:' + v['iqn']
+                iqn = v['iqn']
                 break
 
         model_update = {}