From 85e7c54d8aa3cdc0d0f4bf7197ece645ceb3beb0 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Tue, 25 Sep 2012 15:31:58 +0100
Subject: [PATCH] Revert explicit usage of tgt-adm --conf option.

Fixes bug 1056246.

Reverts commit 0a09bf5faeb30b675fdb8f517c61166ef794bad3.

This ensures that we fail-fast if the tgtd configuration does
not include the directory for volume iscsi target configs,
instead of only blowing up when tgtd is restarted.

Change-Id: I3c9f0d97e411560e5c0fd058671f8c834e9bed1e
---
 nova/tests/test_iscsi.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nova/tests/test_iscsi.py b/nova/tests/test_iscsi.py
index 7b2506a8..09a6e9e8 100644
--- a/nova/tests/test_iscsi.py
+++ b/nova/tests/test_iscsi.py
@@ -95,8 +95,7 @@ class TgtAdmTestCase(test.TestCase, TargetAdminTestCase):
         self.flags(iscsi_helper='tgtadm')
         self.flags(volumes_dir=self.persist_tempdir)
         self.script_template = "\n".join([
-        'tgt-admin --conf %s/blaa --update iqn.2011-09.org.foo.bar:blaa'
-            % self.persist_tempdir,
+        'tgt-admin --update iqn.2011-09.org.foo.bar:blaa',
         'tgt-admin --delete iqn.2010-10.org.openstack:volume-blaa'])
 
     def tearDown(self):