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
Merge branch 'ipv6'
[nodemanager.git]
/
plugins
/
specialaccounts.py
diff --git
a/plugins/specialaccounts.py
b/plugins/specialaccounts.py
index
207eb55
..
2cbda58
100644
(file)
--- a/
plugins/specialaccounts.py
+++ b/
plugins/specialaccounts.py
@@
-1,8
+1,6
@@
#!/usr/bin/python -tt
# vim:set ts=4 sw=4 expandtab:
#
#!/usr/bin/python -tt
# vim:set ts=4 sw=4 expandtab:
#
-# $Id$
-# $URL$
#
# NodeManager plugin to create special accounts
#
# NodeManager plugin to create special accounts
@@
-25,11
+23,11
@@
import tools
# right after conf_files
priority = 3
# right after conf_files
priority = 3
-def start(
options, conf
):
+def start():
logger.log("specialaccounts: plugin starting up...")
def GetSlivers(data, conf = None, plc = None):
logger.log("specialaccounts: plugin starting up...")
def GetSlivers(data, conf = None, plc = None):
- if 'accounts' not in data:
+ if 'accounts' not in data:
logger.log_missing_data("specialaccounts.GetSlivers",'accounts')
return
logger.log_missing_data("specialaccounts.GetSlivers",'accounts')
return
@@
-56,7
+54,7
@@
def GetSlivers(data, conf = None, plc = None):
changes = tools.replace_file_with_string(auth_keys,auth_keys_contents)
if changes:
logger.log("specialaccounts: keys file changed: %s" % auth_keys)
changes = tools.replace_file_with_string(auth_keys,auth_keys_contents)
if changes:
logger.log("specialaccounts: keys file changed: %s" % auth_keys)
-
+
# always set permissions properly
os.chmod(dot_ssh, 0700)
os.chown(dot_ssh, uid,gid)
# always set permissions properly
os.chmod(dot_ssh, 0700)
os.chown(dot_ssh, uid,gid)