summaryrefslogtreecommitdiffstats
path: root/nova/volume
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-10 10:58:56 +0000
committerGerrit Code Review <review@openstack.org>2012-09-10 10:58:56 +0000
commit28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893 (patch)
tree2125c228bd79a63b030830ba720c12f69d4d96bc /nova/volume
parentc3476b5ca7ab5237d3cb8a84fcb7a3292237b764 (diff)
parent0a09bf5faeb30b675fdb8f517c61166ef794bad3 (diff)
downloadnova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.tar.gz
nova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.tar.xz
nova-28a5b31bdbff7ed4492f8a6ca8e7e53a7aba0893.zip
Merge "Specify the conf file when creating a volume."
Diffstat (limited to 'nova/volume')
-rw-r--r--nova/volume/iscsi.py2
1 files changed, 2 insertions, 0 deletions
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)