~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/volume/driver.py

  • Committer: Vishvananda Ishaya
  • Date: 2011-08-25 22:22:51 UTC
  • mfrom: (1479.3.1 lp832200)
  • mto: This revision was merged to the branch mainline in revision 1497.
  • Revision ID: vishvananda@gmail.com-20110825222251-lezc0lcogrgeqa82
merge underlying fix for testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
495
495
        (out, err) = self._execute('iscsiadm', '-m', 'node', '-T',
496
496
                                   iscsi_properties['target_iqn'],
497
497
                                   '-p', iscsi_properties['target_portal'],
498
 
                                   iscsi_command, run_as_root=True)
 
498
                                   *iscsi_command, run_as_root=True)
499
499
        LOG.debug("iscsiadm %s: stdout=%s stderr=%s" %
500
500
                  (iscsi_command, out, err))
501
501
        return (out, err)