summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-08-25 15:22:51 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-08-25 15:22:51 -0700
commitbeed018c5034c33fa806b80ba719e57ae9347acd (patch)
tree43f6d4f45c879e47f70f6384b6979324dc7bd099
parentfafaf040ed4518006efd3e5909ac31bae47af33d (diff)
parent0fc12640a09792fbf278c050c35c62933afcb68d (diff)
downloadnova-beed018c5034c33fa806b80ba719e57ae9347acd.tar.gz
merge underlying fix for testing
-rw-r--r--nova/volume/driver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/volume/driver.py b/nova/volume/driver.py
index 4734707885..06e3d7afda 100644
--- a/nova/volume/driver.py
+++ b/nova/volume/driver.py
@@ -495,7 +495,7 @@ class ISCSIDriver(VolumeDriver):
(out, err) = self._execute('iscsiadm', '-m', 'node', '-T',
iscsi_properties['target_iqn'],
'-p', iscsi_properties['target_portal'],
- iscsi_command, run_as_root=True)
+ *iscsi_command, run_as_root=True)
LOG.debug("iscsiadm %s: stdout=%s stderr=%s" %
(iscsi_command, out, err))
return (out, err)