X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=cb80f7ba8f3e7e069a56665a842ba1c89137071a;hb=33f472e3e3589569f0272f7f53d07b011d2a5490;hp=85cbac25a7019100c1eef3e52b830827e24206b3;hpb=b8ab56f90a3bc546b1cf58c2559dc3c813ba62e3;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 85cbac2..cb80f7b 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -106,9 +106,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): personality="linux64" return personality - # temporary : run vuseradd verbosely - mostly a check for log_call to work properly, - # since the issue with the kernel seems to have been spotted -# logger.log_call(['/usr/sbin/vuseradd', '-t', vref, name, ], timeout=10*60) +# logger.log_call(['/usr/sbin/vuseradd', '-t', vref, name, ], timeout=15*60) logger.log_call(['/bin/bash','-x','/usr/sbin/vuseradd', '-t', vref, name, ], timeout=15*60) # export slicename to the slice in /etc/slicename file('/vservers/%s/etc/slicename' % name, 'w').write(name) @@ -119,7 +117,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log('sliver_vs: %s: set personality to %s'%(name,personality(arch))) @staticmethod - def destroy(name): logger.log_call(['/usr/sbin/vuserdel', name, ]) + def destroy(name): +# logger.log_call(['/usr/sbin/vuserdel', name, ]) + logger.log_call(['/bin/bash','-x','/usr/sbin/vuserdel', name, ]) def configure(self, rec): new_rspec = rec['_rspec']