diff options
| author | vladimir.p <vladimir@zadarastorage.com> | 2011-08-25 19:18:46 -0700 |
|---|---|---|
| committer | vladimir.p <vladimir@zadarastorage.com> | 2011-08-25 19:18:46 -0700 |
| commit | 8b4d46285b7f00a89bad6000fdc78cc2ab1d5608 (patch) | |
| tree | c7756786f2fa32315cd15a59f3f3b09c10196254 /nova/volume | |
| parent | 59e9adb8e2ef39474a04ead76975a1fc3f913550 (diff) | |
| parent | e38ba3a6066de8499ea5cc8d1fb2e5daefbf336a (diff) | |
| download | nova-8b4d46285b7f00a89bad6000fdc78cc2ab1d5608.tar.gz nova-8b4d46285b7f00a89bad6000fdc78cc2ab1d5608.tar.xz nova-8b4d46285b7f00a89bad6000fdc78cc2ab1d5608.zip | |
merged with rev.1499
Diffstat (limited to 'nova/volume')
| -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 2e9a394c7..7a02a7c14 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -530,7 +530,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") @@ -551,7 +551,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): @@ -568,7 +568,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): |