Permalink
Browse files

Backported fix for run_iscsiadm.

  • Loading branch information...
2 parents 1cd32d9 + beed018 commit eaa91e6c5e9b503a1e16f02e89305e44812f19b6 @vishvananda vishvananda committed with Tarmac Aug 25, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 nova/volume/driver.py
View
@@ -523,7 +523,7 @@ def discover_volume(self, context, volume):
"node.session.auth.password",
iscsi_properties['auth_password'])
- self._run_iscsiadm(iscsi_properties, "--login")
+ self._run_iscsiadm(iscsi_properties, ("--login", ))
self._iscsiadm_update(iscsi_properties, "node.startup", "automatic")
@@ -544,7 +544,7 @@ def discover_volume(self, context, volume):
locals())
# The rescan isn't documented as being necessary(?), but it helps
- self._run_iscsiadm(iscsi_properties, "--rescan")
+ self._run_iscsiadm(iscsi_properties, ("--rescan", ))
tries = tries + 1
if not os.path.exists(mount_device):
@@ -561,7 +561,7 @@ def undiscover_volume(self, volume):
"""Undiscover volume on a remote host."""
iscsi_properties = self._get_iscsi_properties(volume)
self._iscsiadm_update(iscsi_properties, "node.startup", "manual")
- self._run_iscsiadm(iscsi_properties, "--logout")
+ self._run_iscsiadm(iscsi_properties, ("--logout", ))
self._run_iscsiadm(iscsi_properties, ('--op', 'delete'))
def check_for_export(self, context, volume_id):

0 comments on commit eaa91e6

Please sign in to comment.