diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-12 20:51:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-12 20:51:29 +0000 |
| commit | 756f43fa5ce8a39db5777861e53480d4b4d6308d (patch) | |
| tree | 416027cdad108e43dffcfc0b161ac2aa60db2111 | |
| parent | 6d9a3e62b073f294330d57a12378c1f6e58bd970 (diff) | |
| parent | ab7e4f2817d8201cd2364cf09aa01f505e911183 (diff) | |
| download | nova-756f43fa5ce8a39db5777861e53480d4b4d6308d.tar.gz nova-756f43fa5ce8a39db5777861e53480d4b4d6308d.tar.xz nova-756f43fa5ce8a39db5777861e53480d4b4d6308d.zip | |
Merge "When deleting an instance, avoid freakout if iscsi device is gone"
| -rw-r--r-- | nova/virt/libvirt/volume.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index dfba9325c..f5a346ca7 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -108,10 +108,11 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): (iscsi_command, out, err)) return (out, err) - def _iscsiadm_update(self, iscsi_properties, property_key, property_value): + def _iscsiadm_update(self, iscsi_properties, property_key, property_value, + **kwargs): iscsi_command = ('--op', 'update', '-n', property_key, '-v', property_value) - return self._run_iscsiadm(iscsi_properties, iscsi_command) + return self._run_iscsiadm(iscsi_properties, iscsi_command, **kwargs) @utils.synchronized('connect_volume') def connect_volume(self, connection_info, mount_device): @@ -197,7 +198,8 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): devices = self.connection.get_all_block_devices() devices = [dev for dev in devices if dev.startswith(device_prefix)] if not devices: - self._iscsiadm_update(iscsi_properties, "node.startup", "manual") + self._iscsiadm_update(iscsi_properties, "node.startup", "manual", + check_exit_code=[0, 255]) self._run_iscsiadm(iscsi_properties, ("--logout",), check_exit_code=[0, 255]) self._run_iscsiadm(iscsi_properties, ('--op', 'delete'), |