X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=96b757fe126349e49295ccb40ade0ee7f1185861;hb=7f15d76b299a996cd8501de1a2f3411696e6bb0b;hp=f2521a3311cb03f34448ff82393e9ab41393b89b;hpb=723c15893937e6350c620f63073a691e5a447a6a;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index f2521a3..96b757f 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -4,8 +4,10 @@
 
 import subprocess
 import sys
+import time
 import os, os.path
 import grp
+from pwd import getpwnam
 from string import Template
 
 import libvirt
@@ -85,7 +87,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         # subvolume)
         command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
         if not logger.log_call(command, timeout=15*60):
-            logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containDir)
+            logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containerDir)
             return
         command = ['chmod', '755', containerDir]
         logger.log_call(command, timeout=15*60)
@@ -134,6 +136,44 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         command = ['cp', '/home/%s/.ssh/id_rsa.pub'%name, '%s/root/.ssh/authorized_keys'%containerDir]
         logger.log_call(command, timeout=30)
 
+        logger.log("creating /etc/slicename file in %s" % os.path.join(containerDir,'etc/slicename'))
+        try:
+            file(os.path.join(containerDir,'etc/slicename'), 'w').write(name)
+        except:
+            logger.log_exc("exception while creating /etc/slicename")
+
+        try:
+            file(os.path.join(containerDir,'etc/slicefamily'), 'w').write(vref)
+        except:
+            logger.log_exc("exception while creating /etc/slicefamily")
+
+        uid = None
+        try:
+            uid = getpwnam(name).pw_uid
+        except KeyError:
+            # keyerror will happen if user id was not created successfully
+            logger.log_exc("exception while getting user id")
+
+        if uid is not None:
+            logger.log("uid is %d" % uid)
+            command = ['mkdir', '%s/home/%s' % (containerDir, name)]
+            logger.log_call(command, timeout=10)
+            command = ['chown', name, '%s/home/%s' % (containerDir, name)]
+            logger.log_call(command, timeout=10)
+            etcpasswd = os.path.join(containerDir, 'etc/passwd')
+            if os.path.exists(etcpasswd):
+                logger.log("adding user %s id %d to %s" % (name, uid, etcpasswd))
+                try:
+                    file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name))
+                except:
+                    logger.log_exc("exception while updating etc/passwd")
+            sudoers = os.path.join(containerDir, 'etc/sudoers')
+            if os.path.exists(sudoers):
+                try:
+                    file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name)
+                except:
+                    logger.log_exc("exception while updating /etc/sudoers")
+
         # 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)
@@ -193,9 +233,21 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         command = ['/usr/sbin/userdel', '-f', '-r', name]
         logger.log_call(command, timeout=15*60)
 
+        if os.path.exists(os.path.join(containerDir,"vsys")):
+            # Slivers with vsys running will fail the subvolume delete.
+            # A more permanent solution may be to ensure that the vsys module
+            # is called before the sliver is destroyed.
+            logger.log("destroying vsys directory and restarting vsys")
+            logger.log_call(["rm", "-fR", os.path.join(containerDir, "vsys")])
+            logger.log_call(["/etc/init.d/vsys", "restart", ])
+
         # Remove rootfs of destroyed domain
         command = ['btrfs', 'subvolume', 'delete', containerDir]
         logger.log_call(command, timeout=60)
 
+        if os.path.exists(containerDir):
+           # oh no, it's still here...
+           logger.log("WARNING: failed to destroy container %s" % containerDir)
+
         logger.verbose('sliver_libvirt: %s destroyed.'%name)