From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Thu, 30 Oct 2014 16:11:05 +0000 (+0100)
Subject: Validating that DNS can resolve hostname to IP in LinuxNode
X-Git-Tag: nepi-3.2.0~62
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=773423155e083ec0db7bd2af4fcd78c3f1469758

Validating that DNS can resolve hostname to IP in LinuxNode
---

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 7873b97a..62ada380 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -369,14 +369,16 @@ class LinuxNode(ResourceManager):
 
         # Get Public IP address if possible
         if not self.get("ip"):
+            ip = None
+
             if self.localhost:
+                ip = socket.gethostbyname(socket.gethostname())
+            else:
                 try:
-                   ip = socket.gethostbyname(socket.gethostname())
+                    ip = socket.gethostbyname(self.get("hostname"))
                 except:
                     msg = "DNS can not resolve hostname %s" % self.get("hostname") 
                     self.debug(msg)
-            else:
-                ip = socket.gethostbyname(self.get("hostname"))
 
             self.set("ip", ip)