check for the xml template first thing, show filename if missing

[nodemanager.git] / sliver_lxc.py

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 4c2a599..8e936fb 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -9,14 +9,13 @@ import os
 import libvirt
 import sys
 from string import Template
+import bwlimit
 import sliver_libvirt as lv
 
-
 class Sliver_LXC(lv.Sliver_Libvirt):
     """This class wraps LXC commands"""
-   
-    SHELL = '/bin/sshsh' 
-    
+
+    SHELL = '/bin/sshsh'
     TYPE = 'sliver.LXC'
     # Need to add a tag at myplc to actually use this account
     # type = 'sliver.LXC'
@@ -26,27 +25,18 @@ class Sliver_LXC(lv.Sliver_Libvirt):
 
     @staticmethod
     def create(name, rec=None):
+        ''' Create dirs, copy fs image, lxc_create '''
         logger.verbose ('sliver_lxc: %s create'%(name))
         conn = lv.getConnection(Sliver_LXC.TYPE)
-        
-        # Template for libvirt sliver configuration
-        try:
-            with open(Sliver_LXC.REF_IMG_BASE_DIR + '/config_template.xml') as f:
-                template = Template(f.read())
-                xml  = template.substitute(name=name)
-        except IOError:
-            logger.log('Cannot find XML template file')
-            return
-        
-        ''' Create dirs, copy fs image, lxc_create '''
+
         # 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"
+            logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
+            vref = "lxc-f14-x86_64"
 
         refImgDir    = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR, vref)
         containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name)
@@ -54,23 +44,36 @@ class Sliver_LXC(lv.Sliver_Libvirt):
         # check the template exists -- there's probably a better way..
         if not os.path.isdir(refImgDir):
             logger.log('sliver_lxc: %s: ERROR Could not create sliver - reference image %s not found' % (name,vref))
+            logger.log('sliver_lxc: %s: ERROR ctd expected reference image in %s'%(name,refImgDir))
+            return
+
+        # Template for libvirt sliver configuration
+        template_filename = Sliver_LXC.REF_IMG_BASE_DIR + '/config_template.xml'
+        try:
+            with open(template_filename) as f:
+                template = Template(f.read())
+                xml  = template.substitute(name=name, xid=xid)
+        except IOError:
+            logger.log('Cannot find XML template file %s'%template_filename)
             return
 
         # Snapshot the reference image fs (assume the reference image is in its own
         # subvolume)
         command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
         logger.log_call(command, timeout=15*60)
+        command = ['chmod', '755', containerDir]
+        logger.log_call(command, timeout=15*60)
 
         # TODO: set quotas...
 
         # Set hostname. A valid hostname cannot have '_'
-        with open(os.path.join(containerDir, 'etc/hostname'), 'w') as f:
-            print >>f, name.replace('_', '-')
+        #with open(os.path.join(containerDir, 'etc/hostname'), 'w') as f:
+        #    print >>f, name.replace('_', '-')
 
         # Add slices group if not already present
         command = ['/usr/sbin/groupadd', 'slices']
         logger.log_call(command, timeout=15*60)
-        
+
         # Add unix account (TYPE is specified in the subclass)
         command = ['/usr/sbin/useradd', '-g', 'slices', '-s', Sliver_LXC.SHELL, name, '-p', '*']
         logger.log_call(command, timeout=15*60)
@@ -82,16 +85,20 @@ class Sliver_LXC(lv.Sliver_Libvirt):
         # guest?
         command = ['su', '-s', '/bin/bash', '-c', 'ssh-keygen -t rsa -N "" -f /home/%s/.ssh/id_rsa'%(name)]
         logger.log_call(command, timeout=15*60)
-        
+
         command = ['chown', '-R', '%s.slices'%name, '/home/%s/.ssh'%name]
         logger.log_call(command, timeout=15*60)
-        
+
         command = ['mkdir', '%s/root/.ssh'%containerDir]
         logger.log_call(command, timeout=15*60)
 
         command = ['cp', '/home/%s/.ssh/id_rsa.pub'%name, '%s/root/.ssh/authorized_keys'%containerDir]
         logger.log_call(command, timeout=15*60)
 
+        # Lookup for xid and create template after the user is created so we
+        # can get the correct xid based on the name of the slice
+        xid = bwlimit.get_xid(name)
+
         # Lookup for the sliver before actually
         # defining it, just in case it was already defined.
         try:
@@ -105,7 +112,7 @@ class Sliver_LXC(lv.Sliver_Libvirt):
     def destroy(name):
         logger.verbose ('sliver_lxc: %s destroy'%(name))
         conn = lv.getConnection(Sliver_LXC.TYPE)
-        
+
         containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name)
 
         try:
@@ -115,17 +122,17 @@ class Sliver_LXC(lv.Sliver_Libvirt):
             logger.verbose('sliver_lxc: Domain %s does not exist! UNEXPECTED'%name)
             return
 
-        try:    
+        try:
             dom.destroy()
         except:
             logger.verbose('sliver_lxc: Domain %s not running... continuing.'%name)
-        
+
         dom.undefine()
 
         # Remove user after destroy domain to force logout
         command = ['/usr/sbin/userdel', '-f', '-r', name]
         logger.log_call(command, timeout=15*60)
-            
+
         # Remove rootfs of destroyed domain
         command = ['btrfs', 'subvolume', 'delete', containerDir]
         logger.log_call(command, timeout=15*60)