Recommitting this patch, after testing it on a PLC node.

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 5d487f6..7a18f34 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -106,7 +106,8 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 personality="linux64"
             return personality
 
-        logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
+#        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)
         file('/vservers/%s/etc/slicefamily' % name, 'w').write(vref)
@@ -116,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']
@@ -237,12 +240,9 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
             if self.is_running():
                 logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id)) 
-                self.setname(self.slice_id) 
-                ### Sapan's change needs more work 
-                # raise IOException, file does not get created
-                # might be that /etc/vservers is not available here, are we in the chroot ?
-                #logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
-                #file('/etc/vservers/%s/slice_id' % self.name, 'w').write(self.slice_id)
+                #self.setname(self.slice_id) 
+                logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
+                file('/etc/vservers/%s/slice_id' % self.name, 'w').write(self.slice_id)
 
             if self.enabled == False:
                 self.enabled = True