diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-08-25 15:08:28 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-08-25 15:08:28 -0700 |
| commit | fafaf040ed4518006efd3e5909ac31bae47af33d (patch) | |
| tree | bf38351276c86ad56aa8c2b1b68fa02c3f25ee66 | |
| parent | 787913ddedce4f3395b4e3d5073a0eea259ed9f7 (diff) | |
| download | nova-fafaf040ed4518006efd3e5909ac31bae47af33d.tar.gz nova-fafaf040ed4518006efd3e5909ac31bae47af33d.tar.xz nova-fafaf040ed4518006efd3e5909ac31bae47af33d.zip | |
pass all commands to run_iscsiadm as a tuple
| -rw-r--r-- | nova/volume/driver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/volume/driver.py b/nova/volume/driver.py index c99534c07..473470788 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -523,7 +523,7 @@ class ISCSIDriver(VolumeDriver): "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 @@ class ISCSIDriver(VolumeDriver): 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 @@ class ISCSIDriver(VolumeDriver): """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): |