From a135c8ecd16bb6a97743e4be1b060daff874879e Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Fri, 16 Dec 2011 13:40:38 -0800 Subject: Properly passes arg to run_iscsiadm to fix logout * fixes 905471 * includes test to verify expected calls * elevates context as expected for volume_api.detach Change-Id: I0c2a5822d45df6f82f103f49ce8fcfe4a38a0049 --- nova/virt/libvirt/volume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/virt') diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 352ba5115..d93680d59 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -172,7 +172,7 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): sup.disconnect_volume(connection_info, mount_device) iscsi_properties = connection_info['data'] self._iscsiadm_update(iscsi_properties, "node.startup", "manual") - self._run_iscsiadm(iscsi_properties, ("--logout"), + self._run_iscsiadm(iscsi_properties, ("--logout",), check_exit_code=[0, 255]) self._run_iscsiadm(iscsi_properties, ('--op', 'delete'), check_exit_code=[0, 255]) -- cgit