Tagging module NodeManager - NodeManager-1.7-18

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 48d7a47..09e46e1 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -19,6 +19,7 @@ don't have to guess if there is a running process or not.
 import errno
 import os, os.path
 import time
+
 import vserver
 
 import accounts
@@ -105,28 +106,42 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             # rejoin the parts
             refname="-".join( (pldistro,fcdistro,arch) )
 
-            # check the templates exists -- there's probably a better way..
+            # check the template exists -- there's probably a better way..
             if not os.path.isdir ("/vservers/.vref/%s"%refname):
                 logger.verbose("%s (%s) : vref %s not found, using default %s"%(
                         name,vref,refname,default))
                 refname=default
+                # reset so arch is right
+                (pldistro,fcdistro,arch) = default.split("-")
                 # could check again, but as we have /etc/slicefamily 
                 # there's probably no /vservers/.vref/default
 
         except IOError:
             # have not found slicefamily
             logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref))
-                # for legacy nodes
+            # for legacy nodes
             refname="default"
+            arch="i386"
         except:
             import traceback
-            logger.log("%s (%s) : unexpected error follows - using 'default'"%(
-                    name,vref))
+            logger.log("%s (%s) : unexpected error follows - using 'default'"%(name,vref))
             logger.log(traceback.format_exc())
             refname="default"
+            arch="i386"
             
+        def personality (arch):
+            personality="linux32"
+            if arch.find("64")>=0:
+                personality="linux64"
+            return personality
+
         logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
-        open('/vservers/%s/etc/slicename' % name, 'w').write(name)
+        # export slicename to the slice in /etc/slicename
+        file('/vservers/%s/etc/slicename' % name, 'w').write(name)
+        # set personality: only if needed (if arch's differ)
+        if tools.root_context_arch() != arch:
+            file('/etc/vservers/%s/personality' % name, 'w').write(personality(arch))
+            logger.log('%s: set personality to %s'%(name,personality(arch)))
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
@@ -178,8 +193,8 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         try:  # if the sliver is over quota, .set_disk_limit will throw an exception
             if not self.disk_usage_initialized:
                 self.vm_running = False
-                logger.log('%s: computing disk usage: beginning' % self.name)
                 Sliver_VS._init_disk_info_sem.acquire()
+                logger.log('%s: computing disk usage: beginning' % self.name)
                 try: self.init_disk_info()
                 finally: Sliver_VS._init_disk_info_sem.release()
                 logger.log('%s: computing disk usage: ended' % self.name)