From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Sun, 3 Aug 2014 18:13:16 +0000 (+0200)
Subject: Merging nepi-3.1-multirun into nepi-3-dev
X-Git-Tag: nepi-3.2.0~105
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6096716dbc88a1d9e6a1be8cac477006225d890e;hp=a3e02ea08e65fabe6104d4ba30ee635c42ebd4d1;p=nepi.git

Merging nepi-3.1-multirun into nepi-3-dev
---

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 01a1d40f..fce5e6dd 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -278,8 +278,7 @@ class LinuxNode(ResourceManager):
         if self._os:
             return self._os
 
-        if self.get("hostname") not in ["localhost", "127.0.0.1"] and \
-                not self.get("username"):
+        if not self.localhost and not self.get("username"):
             msg = "Can't resolve OS, insufficient data "
             self.error(msg)
             raise RuntimeError, msg
@@ -333,7 +332,7 @@ class LinuxNode(ResourceManager):
 
     @property
     def localhost(self):
-        return self.get("hostname") in ['localhost', '127.0.0.7', '::1']
+        return self.get("hostname") in ['localhost', '127.0.0.1', '::1']
 
     def do_provision(self):
         # check if host is alive
@@ -404,8 +403,8 @@ class LinuxNode(ResourceManager):
 
     def clean_processes(self):
         self.info("Cleaning up processes")
- 
-        if self.get("hostname") in ["localhost", "127.0.0.2"]:
+
+        if self.localhost:
             return 
         
         if self.get("username") != 'root':