git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change bug of dict
[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
519f896
..
27f5fc4
100644
(file)
--- a/
src/nepi/resources/linux/node.py
+++ b/
src/nepi/resources/linux/node.py
@@
-23,7
+23,6
@@
from nepi.resources.linux import rpmfuncs, debfuncs
from nepi.util import sshfuncs, execfuncs
import collections
from nepi.util import sshfuncs, execfuncs
import collections
-import logging
import os
import random
import re
import os
import random
import re
@@
-91,8
+90,6
@@
class LinuxNode(ResourceManager):
# lock to avoid concurrency issues on methods used by applications
self._lock = threading.Lock()
# lock to avoid concurrency issues on methods used by applications
self._lock = threading.Lock()
-
- self._logger = logging.getLogger("LinuxNode")
def log_message(self, msg):
return " guid %d - host %s - %s " % (self.guid,
def log_message(self, msg):
return " guid %d - host %s - %s " % (self.guid,
@@
-147,7
+144,7
@@
class LinuxNode(ResourceManager):
def localhost(self):
return self.get("hostname") in ['localhost', '127.0.0.7', '::1']
def localhost(self):
return self.get("hostname") in ['localhost', '127.0.0.7', '::1']
- def provision(self
, filters = None
):
+ def provision(self):
if not self.is_alive():
self._state = ResourceState.FAILED
msg = "Deploy failed. Unresponsive node %s" % self.get("hostname")
if not self.is_alive():
self._state = ResourceState.FAILED
msg = "Deploy failed. Unresponsive node %s" % self.get("hostname")
@@
-644,9
+641,3
@@
class LinuxNode(ResourceManager):
re.I)
return badre.search(out) or badre.search(err)
re.I)
return badre.search(out) or badre.search(err)
- def blacklist(self):
- # TODO!!!!
- self.warn(" Blacklisting malfunctioning node ")
- #import util
- #util.appendBlacklist(self.hostname)
-