Merge "Specify the conf file when creating a volume."

bhagemeier · Sep 10, 2012 · 28a5b31 · 28a5b31
2 parents c3476b5 + 0a09bf5
commit 28a5b31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/nova/tests/test_iscsi.py b/nova/tests/test_iscsi.py
@@ -92,7 +92,7 @@ def setUp(self):
         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
@@ -127,6 +127,8 @@ def create_iscsi_target(self, name, tid, lun, path, **kwargs):
 
         try:
             (out, err) = self._execute('tgt-admin',
+                                       '--conf',
+                                       volume_path,
                                        '--update',
                                        name,
                                        run_as_root=True)