Merge lp:~mnogu/nova/iscsi-execvp into lp:~hudson-openstack/nova/trunk

[Muneyuki Noguchi]

Fix lp741415 by splitting arguments of _execute in the iSCSI driver.

[lp:~mnogu/nova/iscsi-execvp]

859. By Muneyuki Noguchi on 2011-03-24

Remove a blank line.

[Jesse Andrews (anotherjesse)]

lgtm - nice catch!

can't wait to have automated testing of a real deploy working

review: Approve

[justinsb (justin-fathomdb)]

Hit the bug, merged the patch, verified it works.

Adding nova-core so that we can get the second review and get this merged.

review: Approve

[justinsb (justin-fathomdb)]

Oh ... I can't add nova-core because it's not my MP. Let's get this merged though...

=== modified file 'nova/volume/driver.py'
--- nova/volume/driver.py	2011-03-17 21:21:55 +0000
+++ nova/volume/driver.py	2011-03-24 02:58:05 +0000
@@ -422,18 +422,17 @@
         return properties
 
     def _run_iscsiadm(self, iscsi_properties, iscsi_command):
-        command = ("sudo iscsiadm -m node -T %s -p %s %s" %
-                   (iscsi_properties['target_iqn'],
-                    iscsi_properties['target_portal'],
-                    iscsi_command))
-        (out, err) = self._execute(command)
+        (out, err) = self._execute('sudo', 'iscsiadm', '-m', 'node', '-T',
+                                   iscsi_properties['target_iqn'],
+                                   '-p', iscsi_properties['target_portal'],
+                                   iscsi_command)
         LOG.debug("iscsiadm %s: stdout=%s stderr=%s" %
                   (iscsi_command, out, err))
         return (out, err)
 
     def _iscsiadm_update(self, iscsi_properties, property_key, property_value):
-        iscsi_command = ("--op update -n %s -v %s" %
-                         (property_key, property_value))
+        iscsi_command = ('--op', 'update', '-n', property_key,
+                         '-v', property_value)
         return self._run_iscsiadm(iscsi_properties, iscsi_command)
 
     def discover_volume(self, context, volume):
@@ -441,7 +440,7 @@
         iscsi_properties = self._get_iscsi_properties(volume)
 
         if not iscsi_properties['target_discovered']:
-            self._run_iscsiadm(iscsi_properties, "--op new")
+            self._run_iscsiadm(iscsi_properties, ('--op', 'new'))
 
         if iscsi_properties.get('auth_method'):
             self._iscsiadm_update(iscsi_properties,
@@ -493,7 +492,7 @@
         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, "--op delete")
+        self._run_iscsiadm(iscsi_properties, ('--op', 'delete'))
 
     def check_for_export(self, context, volume_id):
         """Make sure volume is exported."""