Merge lp:~vishvananda/nova/fix-iscsiadm into lp:~hudson-openstack/nova/milestone-proposed

[Vish Ishaya]

Backported fix for run_iscsiadm.

[lp:~vishvananda/nova/fix-iscsiadm]

1481. By Vish Ishaya on 2011-08-25

merge underlying fix for testing

=== modified file 'nova/volume/driver.py'
--- nova/volume/driver.py	2011-08-23 22:53:59 +0000
+++ nova/volume/driver.py	2011-08-25 22:32:29 +0000
@@ -523,7 +523,7 @@
                                   "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 @@
                      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 @@
         """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):