summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-07-31 15:56:57 -0500
committerChuck Short <chuck.short@canonical.com>2012-07-31 16:00:17 -0500
commitdcc26e8c414765754dbf568dcaa4490e62f0bc44 (patch)
tree3bb2574e184a1a67fad5412f734e7de73ebbef13 /nova
parent37dee20d2f963ca08e56a95be8c654e1920e4a2a (diff)
downloadnova-dcc26e8c414765754dbf568dcaa4490e62f0bc44.tar.gz
nova-dcc26e8c414765754dbf568dcaa4490e62f0bc44.tar.xz
nova-dcc26e8c414765754dbf568dcaa4490e62f0bc44.zip
Update targets information when creating target.
tgt-admin needs to use --execute --update to tell tgtd to re-read its configuration files when target is created. (LP: #1031509) Change-Id: I71fe4d90a8cc9bcf7a4817aefd6de52e216102a4 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_iscsi.py2
-rw-r--r--nova/volume/iscsi.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_iscsi.py b/nova/tests/test_iscsi.py
index 4ea4deda9..d0db6d62f 100644
--- a/nova/tests/test_iscsi.py
+++ b/nova/tests/test_iscsi.py
@@ -85,7 +85,7 @@ class TgtAdmTestCase(test.TestCase, TargetAdminTestCase):
self.flags(iscsi_helper='tgtadm')
self.flags(volumes_dir="./")
self.script_template = "\n".join([
- "tgt-admin --conf ./blaa --update blaa",
+ "tgt-admin --execute --conf ./blaa --update blaa",
"tgtadm --op show --lld=iscsi --mode=target --tid=1",
"tgt-admin --conf ./blaa --delete blaa"])
diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py
index b846edd8d..97e905ebf 100644
--- a/nova/volume/iscsi.py
+++ b/nova/volume/iscsi.py
@@ -115,7 +115,7 @@ class TgtAdm(TargetAdmin):
f.write(volume_conf)
f.close()
- self._execute('tgt-admin', '--conf %s' % volume_path,
+ self._execute('tgt-admin', '--execute', '--conf %s' % volume_path,
'--update %s' % vol_id, run_as_root=True)
except Exception as ex: