diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 06:29:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 06:29:59 +0000 |
| commit | 022d2ef9688c067c92044d2bbf689cd81c1b03e5 (patch) | |
| tree | bbf1d1540f82de36aa70ad027e6cd103daff96c3 | |
| parent | 233946be5a571aaf11789edb4fb645b241c7dafc (diff) | |
| parent | 628a993ce29cfdee00463c16b932f23e30bc52bf (diff) | |
| download | nova-022d2ef9688c067c92044d2bbf689cd81c1b03e5.tar.gz nova-022d2ef9688c067c92044d2bbf689cd81c1b03e5.tar.xz nova-022d2ef9688c067c92044d2bbf689cd81c1b03e5.zip | |
Merge "libvirt: Improve the idempotency of iscsi detach"
| -rw-r--r-- | nova/virt/libvirt/volume.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 941fd4924..cf08ea85e 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -199,8 +199,8 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): devices = [dev for dev in devices if dev.startswith(device_prefix)] if not devices: self._iscsiadm_update(iscsi_properties, "node.startup", "manual", - check_exit_code=[0, 255]) + check_exit_code=[0, 21, 255]) self._run_iscsiadm(iscsi_properties, ("--logout",), - check_exit_code=[0, 255]) + check_exit_code=[0, 21, 255]) self._run_iscsiadm(iscsi_properties, ('--op', 'delete'), check_exit_code=[0, 21, 255]) |