diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-08-25 23:49:57 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-25 23:49:57 +0000 |
| commit | 655846bd29c440294a2b044cf7a5b616d14c4c30 (patch) | |
| tree | 1a2ede1b2945df6998e24bef817523959264501e | |
| parent | 34ff9626584436babfa257cb6667b8deab8ced0e (diff) | |
| parent | beed018c5034c33fa806b80ba719e57ae9347acd (diff) | |
The fix for run_iscsiadm in rev 1489 changed the call to use a tuple because values were being passed as tuples. Unfortunately a few calls to the method were still passing strings.
| -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 7d2fb45d4..06e3d7afd 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): |