X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=f7019649c91f63ad0ae26753531226987b8cf496;hb=931588ce80de75383b980a3eab806a60396364ba;hp=441b2e6e49962b2009f0854d9a51ce5327590f02;hpb=f699ab76a8c8a5ba09d2286a833a8a05ecf8564c;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index 441b2e6..f701964 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -4,21 +4,23 @@ import subprocess import sys +import time import os, os.path import grp +from pwd import getpwnam from string import Template import libvirt import logger -import bwlimitlxc as bwlimit +import plnode.bwlimit as bwlimit from initscript import Initscript from sliver_libvirt import Sliver_Libvirt class Sliver_LXC(Sliver_Libvirt, Initscript): """This class wraps LXC commands""" - SHELL = '/bin/sshsh' + SHELL = '/usr/sbin/vsh' TYPE = 'sliver.LXC' # Need to add a tag at myplc to actually use this account # type = 'sliver.LXC' @@ -85,15 +87,37 @@ 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) - # customize prompt for slice owner + # customize prompt for slice owner, + LD_PRELOAD for transparently wrap bind dot_profile=os.path.join(containerDir,"root/.profile") + ld_preload_msg="""# by default, we define this setting so that calls to bind(2), +# when invoked on 0.0.0.0, get transparently redirected to the public interface of this node +# see https://svn.planet-lab.org/wiki/LxcPortForwarding""" + usrmove_path_msg="""# VM's before Features/UsrMove need /bin and /sbin in their PATH""" + usrmove_path_code=""" +pathmunge () { + if ! echo $PATH | /bin/egrep -q "(^|:)$1($|:)" ; then + if [ "$2" = "after" ] ; then + PATH=$PATH:$1 + else + PATH=$1:$PATH + fi + fi +} +pathmunge /bin after +pathmunge /sbin after +unset pathmunge +""" with open(dot_profile,'w') as f: f.write("export PS1='%s@\H \$ '\n"%(name)) + f.write("%s\n"%ld_preload_msg) + f.write("export LD_PRELOAD=/etc/planetlab/lib/bind_public.so\n") + f.write("%s\n"%usrmove_path_msg) + f.write("%s\n"%usrmove_path_code) # TODO: set quotas... @@ -129,6 +153,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) @@ -141,10 +203,13 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): else: logger.log("Cannot find XML template %s"%template_filename_sliceimage) return + + interfaces = Sliver_Libvirt.get_interfaces_xml(rec) + try: with open(template_filename) as f: template = Template(f.read()) - xml = template.substitute(name=name, xid=xid) + xml = template.substitute(name=name, interfaces=interfaces) except IOError: logger.log('Failed to parse or use XML template file %s'%template_filename) return @@ -185,9 +250,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)