From 99b9691e3c9fecc7b2f86cfe77c3bab98776deb8 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Tue, 14 Feb 2012 21:48:59 +0000
Subject: Different exit code in new versions of iscsiadm

Fixes bug #932356
For "iscsiadm: No records found"
if version <= 2.0-871 iscsiadm returns 255
newer versions return 21

Change-Id: Ib4319ed11b20a339b439c70574d0d45acc8814fa
---
 nova/virt/libvirt/volume.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py
index 3eb5cfe70..75fa0e5a9 100644
--- a/nova/virt/libvirt/volume.py
+++ b/nova/virt/libvirt/volume.py
@@ -114,7 +114,8 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver):
         try:
             self._run_iscsiadm(iscsi_properties, ())
         except exception.ProcessExecutionError as exc:
-            if exc.exit_code == 255:
+            # iscsiadm returns 21 for "No records found" after version 2.0-871
+            if exc.exit_code in [21, 255]:
                 self._run_iscsiadm(iscsi_properties, ('--op', 'new'))
             else:
                 raise
-- 
cgit