diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 23:54:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 23:54:33 +0000 |
| commit | 2b029d576c531f64e7f2c4b975d045b5837d14c9 (patch) | |
| tree | 1efc9ee4f230733321ed97363668379d845590a1 | |
| parent | 13c82f931f8220ebdcf561933bdd53799a4d8bb5 (diff) | |
| parent | dcc26e8c414765754dbf568dcaa4490e62f0bc44 (diff) | |
Merge "Update targets information when creating target."
| -rw-r--r-- | nova/tests/test_iscsi.py | 2 | ||||
| -rw-r--r-- | nova/volume/iscsi.py | 2 |
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: |