openstack/cinder
Code Issues Proposed changes

Merge "LIO: Fix UnboundLocalError in ensure_export"

Browse Source
This commit is contained in:
Jenkins 2014-11-04 09:07:26 +00:00 committed by Gerrit Code Review
commit 818fc82286
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cinder/volume/iscsi.py
View File

@ -253,16 +253,17 @@ class LioAdm(_ExportMixin, iscsi.LioAdm):
vg_name, conf, old_name=None):
try:
volume_info = self.db.volume_get(context, volume['id'])
(auth_method,
auth_user,
auth_pass) = volume_info['provider_auth'].split(' ', 3)
chap_auth = self._iscsi_authentication(auth_method,
auth_user,
auth_pass)
except exception.NotFound:
LOG.debug("volume_info:%s", volume_info)
LOG.info(_("Skipping ensure_export. No iscsi_target "
"provision for volume: %s"), volume['id'])
return
(auth_method,
auth_user,
auth_pass) = volume_info['provider_auth'].split(' ', 3)
chap_auth = self._iscsi_authentication(auth_method,
auth_user,
auth_pass)
iscsi_target = 1