diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-24 21:47:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-24 21:47:44 +0000 |
| commit | c5fa40bb8597f6809d0326cd324595c01e5be9d2 (patch) | |
| tree | e98677ae73416792f5a21b9e711b2989a1baf0a4 | |
| parent | 325fb8599923ca92fd237b9efd97ccf50beb5dd0 (diff) | |
| parent | 9135f836151df4bc32e3c3fea208e3cee6f7d6dc (diff) | |
| download | nova-c5fa40bb8597f6809d0326cd324595c01e5be9d2.tar.gz nova-c5fa40bb8597f6809d0326cd324595c01e5be9d2.tar.xz nova-c5fa40bb8597f6809d0326cd324595c01e5be9d2.zip | |
Merge "Trap iscsiadm error"
| -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 54e6bfbf6..941fd4924 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -203,4 +203,4 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): self._run_iscsiadm(iscsi_properties, ("--logout",), check_exit_code=[0, 255]) self._run_iscsiadm(iscsi_properties, ('--op', 'delete'), - check_exit_code=[0, 255]) + check_exit_code=[0, 21, 255]) |