X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=89f7324f33e41e084e9c14e2b038315034882577;hb=080d720988c066288091a9957c702fef112275f1;hp=bdb7b5967294df72ee99affb2dd7148352118794;hpb=ae363e88ec7cbb13a8875dfaa03ba17e38229e43;p=nodemanager.git

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index bdb7b59..89f7324 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -8,6 +8,7 @@ import subprocess
 import os
 import libvirt
 import sys
+import shutil
 
 from string import Template
 
@@ -36,22 +37,34 @@ class Sliver_LV(accounts.Account):
         ''' Create dirs, copy fs image, lxc_create '''
         logger.verbose ('sliver_libvirt: %s create'%(name))
         dir = '/vservers/%s'%(name)
-        
-        # Template for sliver configuration
-        template = Template(open('/vservers/config_template.xml').read())
+
+        # Template for libvirt sliver configuration
+        template = Template(open('/vservers/.lvref/config_template.xml').read())
         config = template.substitute(name=name)
         
         lxc_log = '%s/log'%(dir)
        
-        # TODO: copy the sliver FS to the correct path if sliver does not
-        # exist.
-        if not (os.path.isdir(dir) and 
-            os.access(dir, os.R_OK | os.W_OK | os.X_OK)):
-            logger.verbose('lxc_create: directory %s does not exist or wrong perms'%(dir))
+        # Get the type of image from vref myplc tags specified as:
+        # pldistro = lxc
+        # fcdistro = squeeze
+        # arch x86_64
+        vref = rec['vref']
+        if vref is None:
+            logger.log("sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-debian"%(name))
+            vref = "lxc-squeeze-x86_64"
+
+        # check the template exists -- there's probably a better way..
+        if not os.path.isdir ("/vservers/.lvref/%s"%vref):
+            logger.log ("sliver_libvirt: %s: ERROR Could not create sliver - reference image %s not found"%(name,vref))
             return
+        
+        # Copy the reference image fs
+        # shutil.copytree("/vservers/.lvref/%s"%vref, "/vservers/%s"%name, symlinks=True)
+        command = ['cp', '-r', '/vservers/.lvref/%s'%vref, '/vservers/%s'%name]
+        logger.log_call(command, timeout=15*60)
 
         # Set hostname
-        file('/vservers/%s/rootfs/etc/hostname' % name, 'w').write(name)
+        file('/vservers/%s/etc/hostname' % name, 'w').write(name)
         
         # Add unix account
         command = ['/usr/sbin/useradd', '-s', '/bin/sh', name]
@@ -79,9 +92,13 @@ class Sliver_LV(accounts.Account):
             command = ['/usr/sbin/userdel', name]
             logger.log_call(command, timeout=15*60)
             
+            # Destroy libvirt domain
             dom = conn.lookupByName(name)
             dom.destroy()
             dom.undefine()
+
+            # Remove rootfs of destroyed domain
+            shutil.rmtree("/vservers/%s"%name)
         except:
             logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(name, sys.exc_info()[0]))
     
@@ -104,8 +121,7 @@ class Sliver_LV(accounts.Account):
         try:
             self.container = conn.lookupByName(self.name)
         except:
-            logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(name, sys.exc_info()[0]))
-            print "Unexpected error:", sys.exc_info()[0]
+            logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(self.name, sys.exc_info()[0]))
 
     def configure(self, rec):
         ''' Allocate resources and fancy configuration stuff '''