Do not try to initialize iSCSI drive, when the portal cannot be detected (#435173)

1 files changed, 8 insertions, 0 deletions

diff --git a/iscsi.py b/iscsi.py
index d23f1980b..bcb54df12 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -114,6 +114,10 @@ class iscsiTarget:
         return True
 
     def startNode(self, node):
+        if node is None or self.portal is None:
+            log.warn("unable to find portal information")
+            return
+
         argv = [ "-m", "node", "-T", node, "-p", self.portal,
                  "-o", "update", "-n", "node.conn[0].startup",
                  "-v", "automatic" ]
@@ -122,6 +126,10 @@ class iscsiTarget:
                                stdout = "/dev/tty5", stderr="/dev/tty5")
 
     def loginToNode(self, node):
+        if node is None or self.portal is None:
+            log.warn("unable to find portal information")
+            return
+
         argv = [ "-m", "node", "-T", node, "-p", self.portal, "--login" ]
         log.debug("iscsiadm %s" %(string.join(argv),))
         rc = iutil.execWithRedirect(ISCSIADM, argv,