diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-10 10:58:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-10 10:58:56 +0000 |
| commit | 28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893 (patch) | |
| tree | 2125c228bd79a63b030830ba720c12f69d4d96bc | |
| parent | c3476b5ca7ab5237d3cb8a84fcb7a3292237b764 (diff) | |
| parent | 0a09bf5faeb30b675fdb8f517c61166ef794bad3 (diff) | |
| download | nova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.tar.gz nova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.tar.xz nova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.zip | |
Merge "Specify the conf file when creating a volume."
| -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) |