summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-07 17:33:39 +0000
committerGerrit Code Review <review@openstack.org>2012-08-07 17:33:39 +0000
commitca3c98bdb84d29bc460dd117598ea59c5dc2ae28 (patch)
treefb7cdc7fd3f1e44b49b7e0709dd09beaabf22027 /nova
parent210ed0fc80442d7e7213f756d72ce24179e12be8 (diff)
parent3222ba2728dbf1d0760c5dbe0c8b77c73936ee80 (diff)
downloadnova-ca3c98bdb84d29bc460dd117598ea59c5dc2ae28.tar.gz
nova-ca3c98bdb84d29bc460dd117598ea59c5dc2ae28.tar.xz
nova-ca3c98bdb84d29bc460dd117598ea59c5dc2ae28.zip
Merge "Fixes parameter passing to tgt-admin for iscsi"
Diffstat (limited to 'nova')
-rw-r--r--nova/volume/iscsi.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py
index 7d714aeab..69b14faf1 100644
--- a/nova/volume/iscsi.py
+++ b/nova/volume/iscsi.py
@@ -116,8 +116,8 @@ class TgtAdm(TargetAdmin):
f.close()
self._execute('tgt-admin', '--execute',
- '--conf %s' % volume_path,
- '--update %s' % vol_id, run_as_root=True)
+ '--conf', volume_path,
+ '--update', vol_id, run_as_root=True)
except Exception as ex:
LOG.exception(ex)