From 3222ba2728dbf1d0760c5dbe0c8b77c73936ee80 Mon Sep 17 00:00:00 2001
From: Renuka Apte <renuka.apte@citrix.com>
Date: Mon, 6 Aug 2012 14:27:30 -0700
Subject: Fixes parameter passing to tgt-admin for iscsi

Fixes bug 1033670

The change to add persistent volumes for tgtd 1ba3dfec,
passes parameters as '--conf %s' % volume_path,
'--update %s' % vol_id etc. which cause the tgt-admin command
to fail silently because the options are misquoted.

Instead pass as '--conf', volume_path

Change-Id: Ic986ee5fe21a0927c1aa2f8c94420fe30127d088
---
 nova/volume/iscsi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py
index 7d714aeab..69b14faf1 100644
--- a/nova/volume/iscsi.py
+++ b/nova/volume/iscsi.py
@@ -116,8 +116,8 @@ 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)
-- 
cgit