← Back to branch summary

~hudson-openstack/nova/trunk

« back to all changes in this revision

Viewing changes to nova/volume/driver.py

  • Committer: vladimir.p
  • Date: 2011-08-26 02:18:46 UTC
  • mfrom: (1499 nova)
  • mto: This revision was merged to the branch mainline in revision 1502.
  • Revision ID: vladimir@zadarastorage.com-20110826021846-rrqtmv3ynu3bhg3n
merged with rev.1499

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/volume/driver.py
530
530
                                  "node.session.auth.password",
531
531
                                  iscsi_properties['auth_password'])
532
532
 
533
 
        self._run_iscsiadm(iscsi_properties, "--login")
 
533
        self._run_iscsiadm(iscsi_properties, ("--login", ))
534
534
 
535
535
        self._iscsiadm_update(iscsi_properties, "node.startup", "automatic")
536
536
 
551
551
                     locals())
552
552
 
553
553
            # The rescan isn't documented as being necessary(?), but it helps
554
 
            self._run_iscsiadm(iscsi_properties, "--rescan")
 
554
            self._run_iscsiadm(iscsi_properties, ("--rescan", ))
555
555
 
556
556
            tries = tries + 1
557
557
            if not os.path.exists(mount_device):
568
568
        """Undiscover volume on a remote host."""
569
569
        iscsi_properties = self._get_iscsi_properties(volume)
570
570
        self._iscsiadm_update(iscsi_properties, "node.startup", "manual")
571
 
        self._run_iscsiadm(iscsi_properties, "--logout")
 
571
        self._run_iscsiadm(iscsi_properties, ("--logout", ))
572
572
        self._run_iscsiadm(iscsi_properties, ('--op', 'delete'))
573
573
 
574
574
    def check_for_export(self, context, volume_id):