diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-10 17:55:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-10 17:55:08 +0000 |
| commit | 641223db012211b353658dabaec27942e89ee5c6 (patch) | |
| tree | d7ec07ec5139db2ff55fe60d9b4f2e4b85f51904 /nova/volume | |
| parent | 2e4c23279327e526d8d5ee936653c35181574c1d (diff) | |
| parent | ff3b994f12edf28d187bb1987aa7094b7897b015 (diff) | |
| download | nova-641223db012211b353658dabaec27942e89ee5c6.tar.gz nova-641223db012211b353658dabaec27942e89ee5c6.tar.xz nova-641223db012211b353658dabaec27942e89ee5c6.zip | |
Merge "Handle missing 'provider_location' in rm_export."
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/driver.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/volume/driver.py b/nova/volume/driver.py index 07addd742..f7cd9fb57 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -356,12 +356,6 @@ class ISCSIDriver(VolumeDriver): def remove_export(self, context, volume): """Removes an export for a logical volume.""" - #BOOKMARK jdg - location = volume['provider_location'].split(' ') - iqn = location[1] - if 'iqn' not in iqn: - LOG.warning(_("Jacked... didn't get an iqn")) - return # NOTE(jdg): tgtadm doesn't use the iscsi_targets table # TODO(jdg): In the future move all of the dependent stuff into the @@ -378,6 +372,12 @@ class ISCSIDriver(VolumeDriver): iscsi_target = 0 try: + + # NOTE: provider_location may be unset if the volume hasn't + # been exported + location = volume['provider_location'].split(' ') + iqn = location[1] + # ietadm show will exit with an error # this export has already been removed self.tgtadm.show_target(iscsi_target, iqn=iqn) |