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
an attempt to see if avoiding to run initscripts altogether solves the slice re-creat...
[nodemanager.git]
/
account.py
diff --git
a/account.py
b/account.py
index
063b6d0
..
b1956d3
100644
(file)
--- a/
account.py
+++ b/
account.py
@@
-98,8
+98,8
@@
class Account:
"""
Write <rec['keys']> to my authorized_keys file.
"""
"""
Write <rec['keys']> to my authorized_keys file.
"""
- logger.verbose('account: configuring %s' % self.name)
new_keys = rec['keys']
new_keys = rec['keys']
+ logger.verbose('account: configuring {} with {} keys'.format(self.name, len(new_keys)))
if new_keys != self.keys:
# get the unix account info
gid = grp.getgrnam("slices")[2]
if new_keys != self.keys:
# get the unix account info
gid = grp.getgrnam("slices")[2]
@@
-207,7
+207,7
@@
class Worker:
if rec['reservation_alive']:
# this sliver has the lease, it is safe to start it
if not self.is_running():
if rec['reservation_alive']:
# this sliver has the lease, it is safe to start it
if not self.is_running():
- self.start()
+ self.start(
rec
)
else: self.configure(rec)
else:
# not having the lease, do not start it
else: self.configure(rec)
else:
# not having the lease, do not start it
@@
-217,7
+217,7
@@
class Worker:
# in a reservable node
else:
if not self.is_running() or next_class != curr_class:
# in a reservable node
else:
if not self.is_running() or next_class != curr_class:
- self.start()
+ self.start(
rec
)
else:
self.configure(rec)
else:
self.configure(rec)