# the util-vserver-pl module
import vserver
-import accounts
+import account
import logger
import tools
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'
self.create(name, rec)
logger.log("sliver_vs: %s: second chance..."%name)
vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager')
-
self.keys = ''
self.rspec = {}
self.slice_id = rec['slice_id']
#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
if code:
logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
if self.is_running():
- # Only need to rerun the initscript if the vserver is
+ # Only need to rerun the initscript if the vserver is
# already running. If the vserver isn't running, then the
# initscript will automatically be started by
# /etc/rc.d/vinit when the vserver is started.