From dcc26e8c414765754dbf568dcaa4490e62f0bc44 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Tue, 31 Jul 2012 15:56:57 -0500 Subject: 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 --- nova/tests/test_iscsi.py | 2 +- nova/volume/iscsi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nova') 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: -- cgit