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
This commit is contained in:
Eoghan Glynn
2012-09-25 15:31:58 +01:00
parent 425ba586cc
commit 85e7c54d8a

View File

@@ -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):