X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=20bca721538f95b6c4e30016c87c60fe0b07baf5;hb=cdf732863cd300caf8222c59e3f38256d9e04fca;hp=fdb2e343289ba33144d371d8ee1574afb62805e6;hpb=359fe09b9c56bb24fee2d828d2baddfaec7f9c05;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index fdb2e34..20bca72 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -29,7 +29,7 @@ import subprocess # the util-vserver-pl module import vserver -import accounts +import account 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 -class Sliver_VS(accounts.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' @@ -151,7 +151,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): #self.initscriptchanged = True self.refresh_slice_vinit() - accounts.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