From: John Griffith <john.griffith@solidfire.com>
Date: Thu, 23 Aug 2012 19:23:04 +0000 (-0600)
Subject: Fix incorrect tgt-admin call in create_iscsi_target
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3034247a4ec7c9c6e433cad6d13183b001fe2e6d;p=openstack-build%2Fcinder-build.git

Fix incorrect tgt-admin call in create_iscsi_target

  * Fixes bug 1039826
  * Missed one of the execute cmds that was using 'val %s' as args

Change-Id: I5e6af737ada1c2bcf7a495710e2b10c8c74bb534
---

diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py
index 4805d0c45..260eb6a58 100644
--- a/cinder/volume/iscsi.py
+++ b/cinder/volume/iscsi.py
@@ -116,8 +116,9 @@ class TgtAdm(TargetAdmin):
                 f.close()
 
             self._execute('tgt-admin', '--execute',
-                          '--conf %s' % volume_path,
-                          '--update %s' % vol_id, run_as_root=True)
+                          '--conf', volume_path,
+                          '--update', vol_id,
+                          run_as_root=True)
 
         except Exception as ex:
             LOG.exception(ex)