diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-26 00:47:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-26 00:47:28 +0000 |
| commit | c367fa5e4a5e4712bde9fc319ae6c2f4f2add606 (patch) | |
| tree | d1bd4137e28d174ba4d9e4a44884cacffe36b1f0 /nova/volume | |
| parent | a6aee3667b5c4437501eeecfb7d8ed8bf14d76e0 (diff) | |
| parent | 8ab365c5a9302d9770807e9ee8a6ed4100304298 (diff) | |
| download | nova-c367fa5e4a5e4712bde9fc319ae6c2f4f2add606.tar.gz nova-c367fa5e4a5e4712bde9fc319ae6c2f4f2add606.tar.xz nova-c367fa5e4a5e4712bde9fc319ae6c2f4f2add606.zip | |
Merge "Fixes remove_export for IetAdm"
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/driver.py | 2 | ||||
| -rw-r--r-- | nova/volume/iscsi.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nova/volume/driver.py b/nova/volume/driver.py index 498216a2c..0781d65f9 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -396,7 +396,7 @@ class ISCSIDriver(VolumeDriver): except exception.NotFound: LOG.info(_("Skipping remove_export. No iscsi_target " "provisioned for volume: %s"), volume['id']) - return + return else: iscsi_target = 0 diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py index c86188b30..275132ce6 100644 --- a/nova/volume/iscsi.py +++ b/nova/volume/iscsi.py @@ -75,7 +75,7 @@ class TargetAdmin(object): """Delete a target.""" raise NotImplementedError() - def show_target(self, tid, **kwargs): + def show_target(self, tid, iqn=None, **kwargs): """Query the given target ID.""" raise NotImplementedError() @@ -170,9 +170,7 @@ class TgtAdm(TargetAdmin): os.unlink(volume_path) - def show_target(self, tid, **kwargs): - iqn = kwargs.get('iqn', None) - + def show_target(self, tid, iqn=None, **kwargs): if iqn is None: raise exception.InvalidParameterValue( err=_('valid iqn needed for show_target')) @@ -209,7 +207,7 @@ class IetAdm(TargetAdmin): '--tid=%s' % tid, **kwargs) - def show_target(self, tid, **kwargs): + def show_target(self, tid, iqn=None, **kwargs): self._run('--op', 'show', '--tid=%s' % tid, **kwargs) |