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
rename accounts into account for consistency
[nodemanager.git]
/
sliver_vs.py
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
fdb2e34
..
20bca72
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-29,7
+29,7
@@
import subprocess
# the util-vserver-pl module
import vserver
# the util-vserver-pl module
import vserver
-import account
s
+import account
import logger
import tools
import logger
import tools
@@
-45,7
+45,7
@@
for rlimit in vserver.RLIMITS.keys():
DEFAULT_ALLOCATION["%s_soft"%rlim]=KEEP_LIMIT
DEFAULT_ALLOCATION["%s_hard"%rlim]=KEEP_LIMIT
DEFAULT_ALLOCATION["%s_soft"%rlim]=KEEP_LIMIT
DEFAULT_ALLOCATION["%s_hard"%rlim]=KEEP_LIMIT
-class Sliver_VS(account
s
.Account, vserver.VServer):
+class Sliver_VS(account.Account, vserver.VServer):
"""This class wraps vserver.VServer to make its interface closer to what we need."""
SHELL = '/bin/vsh'
"""This class wraps vserver.VServer to make its interface closer to what we need."""
SHELL = '/bin/vsh'
@@
-151,7
+151,7
@@
class Sliver_VS(accounts.Account, vserver.VServer):
#self.initscriptchanged = True
self.refresh_slice_vinit()
#self.initscriptchanged = True
self.refresh_slice_vinit()
- account
s
.Account.configure(self, rec) # install ssh keys
+ account.Account.configure(self, rec) # install ssh keys
# unconditionnally install and enable the generic vinit script
# mimicking chkconfig for enabling the generic vinit script
# unconditionnally install and enable the generic vinit script
# mimicking chkconfig for enabling the generic vinit script