added verbosity to sshsh, and fix make sync so it shows up at the

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index fdb2e34..9afbe68 100644 (file)
--- 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'
@@ -67,7 +67,6 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             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']
@@ -151,7 +150,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
@@ -187,7 +186,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             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.