Bugfixing GPG key error when installing dependencies in linux nodes

[nepi.git] / src / nepi / resources / linux / node.py

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index d71d21f..ece4bd1 100644 (file)
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -142,6 +142,9 @@ class LinuxNode(ResourceManager):
 
     """
     _rtype = "LinuxNode"
+    _help = "Controls Linux host machines ( either localhost or a host " \
+            "that can be accessed using a SSH key)"
+    _backend_type = "linux"
 
     @classmethod
     def _register_attributes(cls):
@@ -270,6 +273,8 @@ class LinuxNode(ResourceManager):
             self._os = OSType.FEDORA_12
         elif out.find("Fedora release 14") == 0:
             self._os = OSType.FEDORA_14
+        elif out.find("Fedora release") == 0:
+            self._os = OSType.FEDORA
         elif out.find("Debian") == 0: 
             self._os = OSType.DEBIAN
         elif out.find("Ubuntu") ==0:
@@ -288,7 +293,7 @@ class LinuxNode(ResourceManager):
         # until the result is not empty string
         out = ""
         retrydelay = 1.0
-        for i in xrange(10):
+        for i in xrange(2):
             try:
                 (out, err), proc = self.execute("cat /etc/issue", 
                         retry = 5,
@@ -907,7 +912,7 @@ class LinuxNode(ResourceManager):
         pid = ppid = None
         delay = 1.0
 
-        for i in xrange(4):
+        for i in xrange(2):
             pidtuple = self.getpid(home = home, pidfile = pidfile)
             
             if pidtuple:
@@ -964,7 +969,7 @@ class LinuxNode(ResourceManager):
         # To work arround this, repeat the operation N times or
         # until the result is not empty string
         retrydelay = 1.0
-        for i in xrange(10):
+        for i in xrange(2):
             try:
                 (out, err), proc = self.execute("echo 'ALIVE'",
                         retry = 5,
@@ -997,7 +1002,7 @@ class LinuxNode(ResourceManager):
         # To work arround this, repeat the operation N times or
         # until the result is not empty string
         retrydelay = 1.0
-        for i in xrange(10):
+        for i in xrange(2):
             try:
                 (out, err), proc = self.execute("echo ${HOME}",
                         retry = 5,