git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetic fix
[nodemanager.git]
/
controller.py
diff --git
a/controller.py
b/controller.py
index
264b3bb
..
1fc4847
100644
(file)
--- a/
controller.py
+++ b/
controller.py
@@
-3,7
+3,8
@@
import accounts
import logger
import tools
import accounts
import logger
import tools
-
+from pwd import getpwnam
+from grp import getgrnam
class Controller(accounts.Account):
SHELL = '/usr/bin/forward_api_calls' # tunneling shell
class Controller(accounts.Account):
SHELL = '/usr/bin/forward_api_calls' # tunneling shell
@@
-12,11
+13,17
@@
class Controller(accounts.Account):
@staticmethod
def create(name, vref = None):
add_shell(Controller.SHELL)
@staticmethod
def create(name, vref = None):
add_shell(Controller.SHELL)
- logger.log_call('/usr/sbin/useradd', '-p', '*', '-s', Controller.SHELL, name)
+ group = getgrnam("slices")[2]
+ logger.log_call('/usr/sbin/useradd', '-p', '*', '-g', str(group), '-s', Controller.SHELL, name)
@staticmethod
def destroy(name): logger.log_call('/usr/sbin/userdel', '-r', name)
@staticmethod
def destroy(name): logger.log_call('/usr/sbin/userdel', '-r', name)
+ def is_running(self):
+ logger.verbose("Delegate: %s" % self.name)
+ return getpwnam(self.name)[6] == self.SHELL
+
+
def add_shell(shell):
"""Add <shell> to /etc/shells if it's not already there."""
etc_shells = open('/etc/shells')
def add_shell(shell):
"""Add <shell> to /etc/shells if it's not already there."""
etc_shells = open('/etc/shells')