diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-20 16:26:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-20 16:26:26 +0000 |
| commit | f7b0cf3eb00900971c26cfb772abef8f2d374220 (patch) | |
| tree | 47a29786d18623826cdafbefae183fc5519545a4 | |
| parent | 032308c7920b368541f1f89bfab550e1e9e48f31 (diff) | |
| parent | 13eee3d1d7b40bc334d663b7cea7c65a8f960dfe (diff) | |
| download | nova-f7b0cf3eb00900971c26cfb772abef8f2d374220.tar.gz nova-f7b0cf3eb00900971c26cfb772abef8f2d374220.tar.xz nova-f7b0cf3eb00900971c26cfb772abef8f2d374220.zip | |
Merge "Allow exit code 21 for 'iscsiadm -m session'."
| -rw-r--r-- | nova/virt/libvirt/volume.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 8fefeb41f..a5bd2dd43 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -327,7 +327,7 @@ class LibvirtISCSIVolumeDriver(LibvirtBaseVolumeDriver): #so we scan active sessions to see if the node is logged in. out = self._run_iscsiadm_bare(["-m", "session"], run_as_root=True, - check_exit_code=[0, 1])[0] or "" + check_exit_code=[0, 1, 21])[0] or "" portals = [{'portal': p.split(" ")[2], 'iqn': p.split(" ")[3]} for p in out.splitlines() if p.startswith("tcp:")] |