diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_iscsi.py | 2 | ||||
| -rw-r--r-- | nova/volume/iscsi.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/tests/test_iscsi.py b/nova/tests/test_iscsi.py index d375313e2..9fcd219cc 100644 --- a/nova/tests/test_iscsi.py +++ b/nova/tests/test_iscsi.py @@ -92,7 +92,7 @@ class TgtAdmTestCase(test.TestCase, TargetAdminTestCase): self.flags(iscsi_helper='tgtadm') self.flags(volumes_dir="./") self.script_template = "\n".join([ - 'tgt-admin --update iqn.2011-09.org.foo.bar:blaa', + 'tgt-admin --conf ./blaa --update iqn.2011-09.org.foo.bar:blaa', 'tgt-admin --delete iqn.2010-10.org.openstack:volume-blaa']) diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py index 52f8c4009..4d18526de 100644 --- a/nova/volume/iscsi.py +++ b/nova/volume/iscsi.py @@ -127,6 +127,8 @@ class TgtAdm(TargetAdmin): try: (out, err) = self._execute('tgt-admin', + '--conf', + volume_path, '--update', name, run_as_root=True) |