diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-16 03:23:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-16 03:23:01 +0000 |
| commit | d2f2df5a3ba5c3300899d95d4c96c2a80ffc896d (patch) | |
| tree | ab64564fed142ea33ebff47ea3df4fb56835765c | |
| parent | 0333d6da8e6710215f05a7532e48328fd6334105 (diff) | |
| parent | 99b9691e3c9fecc7b2f86cfe77c3bab98776deb8 (diff) | |
| download | nova-d2f2df5a3ba5c3300899d95d4c96c2a80ffc896d.tar.gz nova-d2f2df5a3ba5c3300899d95d4c96c2a80ffc896d.tar.xz nova-d2f2df5a3ba5c3300899d95d4c96c2a80ffc896d.zip | |
Merge "Different exit code in new versions of iscsiadm"
| -rw-r--r-- | nova/virt/libvirt/volume.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 3eb5cfe70..75fa0e5a9 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -114,7 +114,8 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): try: self._run_iscsiadm(iscsi_properties, ()) except exception.ProcessExecutionError as exc: - if exc.exit_code == 255: + # iscsiadm returns 21 for "No records found" after version 2.0-871 + if exc.exit_code in [21, 255]: self._run_iscsiadm(iscsi_properties, ('--op', 'new')) else: raise |