X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=7fcef281c5d8d7b87e82928f3e6f8747ee10ac52;hb=834827443f52ebcf42f37664781e95a86f5c654b;hp=6e78ede3af3ca750885a475f112bf080a94fa24c;hpb=c6bcc5ecda35a373b8232a5015a6209a63e5c825;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index 6e78ede..7fcef28 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -2,20 +2,25 @@ """LXC slivers""" -import accounts -import logger import subprocess -import os -import libvirt import sys +import time +import os, os.path +import grp +from pwd import getpwnam from string import Template -import bwlimit -import sliver_libvirt as lv -class Sliver_LXC(lv.Sliver_Libvirt): +import libvirt + +import logger +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' @@ -23,11 +28,42 @@ class Sliver_LXC(lv.Sliver_Libvirt): REF_IMG_BASE_DIR = '/vservers/.lvref' CON_BASE_DIR = '/vservers' + def __init__ (self, rec): + name=rec['name'] + Sliver_Libvirt.__init__ (self,rec) + Initscript.__init__ (self,name) + + def configure (self, rec): + Sliver_Libvirt.configure (self,rec) + + # in case we update nodemanager.. + self.install_and_enable_vinit() + # do the configure part from Initscript + Initscript.configure(self,rec) + + def start(self, delay=0): + if 'enabled' in self.rspec and self.rspec['enabled'] <= 0: + logger.log('sliver_lxc: not starting %s, is not enabled'%self.name) + return + # the generic /etc/init.d/vinit script is permanently refreshed, and enabled + self.install_and_enable_vinit() + Sliver_Libvirt.start (self, delay) + # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice + self.refresh_slice_vinit() + + def rerun_slice_vinit (self): + """This is called whenever the initscript code changes""" + # xxx - todo - not sure exactly how to: + # (.) invoke something in the guest + # (.) which options of systemctl should be used to trigger a restart + # should not prevent the first run from going fine hopefully + logger.log("WARNING: sliver_lxc.rerun_slice_vinit not implemented yet") + @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) + conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE) # Get the type of image from vref myplc tags specified as: # pldistro = lxc @@ -44,15 +80,28 @@ 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 Expected reference image in %s'%(name,refImgDir)) 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) + if not logger.log_call(command, timeout=15*60): + logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containDir) + return command = ['chmod', '755', containerDir] logger.log_call(command, timeout=15*60) + # 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""" + 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") + # TODO: set quotas... # Set hostname. A valid hostname cannot have '_' @@ -60,8 +109,11 @@ class Sliver_LXC(lv.Sliver_Libvirt): # print >>f, name.replace('_', '-') # Add slices group if not already present - command = ['/usr/sbin/groupadd', 'slices'] - logger.log_call(command, timeout=15*60) + try: + group = grp.getgrnam('slices') + except: + 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', '*'] @@ -73,28 +125,73 @@ class Sliver_LXC(lv.Sliver_Libvirt): # password... maybe remove the need for authentication inside the # 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) + logger.log_call(command, timeout=60) command = ['chown', '-R', '%s.slices'%name, '/home/%s/.ssh'%name] - logger.log_call(command, timeout=15*60) + logger.log_call(command, timeout=30) command = ['mkdir', '%s/root/.ssh'%containerDir] - logger.log_call(command, timeout=15*60) + logger.log_call(command, timeout=10) + + command = ['chown', name, '%s/root/.ssh'%containerDir] + logger.log_call(command, timeout=10) command = ['cp', '/home/%s/.ssh/id_rsa.pub'%name, '%s/root/.ssh/authorized_keys'%containerDir] - logger.log_call(command, timeout=15*60) + 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)) + file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name)) + sudoers = os.path.join(containerDir, 'etc/sudoers') + if os.path.exists(sudoers): + file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name) # 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) # Template for libvirt sliver configuration + template_filename_sliceimage = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR,'lxc_template.xml') + if os.path.isfile (template_filename_sliceimage): + logger.log("WARNING: using compat template %s"%template_filename_sliceimage) + template_filename=template_filename_sliceimage + else: + logger.log("Cannot find XML template %s"%template_filename_sliceimage) + return + + interfaces = Sliver_Libvirt.get_interfaces_xml(rec) + try: - with open(Sliver_LXC.REF_IMG_BASE_DIR + '/config_template.xml') as f: + 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('Cannot find XML template file') + logger.log('Failed to parse or use XML template file %s'%template_filename) return # Lookup for the sliver before actually @@ -103,13 +200,13 @@ class Sliver_LXC(lv.Sliver_Libvirt): dom = conn.lookupByName(name) except: dom = conn.defineXML(xml) - logger.verbose('lxc_create: %s -> %s'%(name, lv.debuginfo(dom))) + logger.verbose('lxc_create: %s -> %s'%(name, Sliver_Libvirt.debuginfo(dom))) @staticmethod def destroy(name): logger.verbose ('sliver_lxc: %s destroy'%(name)) - conn = lv.getConnection(Sliver_LXC.TYPE) + conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE) containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name) @@ -117,23 +214,37 @@ class Sliver_LXC(lv.Sliver_Libvirt): # Destroy libvirt domain dom = conn.lookupByName(name) except: - logger.verbose('sliver_lxc: Domain %s does not exist! UNEXPECTED'%name) - return + logger.verbose('sliver_lxc: Domain %s does not exist!' % name) try: dom.destroy() except: - logger.verbose('sliver_lxc: Domain %s not running... continuing.'%name) + logger.verbose('sliver_lxc: Domain %s not running... continuing.' % name) - dom.undefine() + try: + dom.undefine() + except: + logger.verbose('sliver_lxc: Domain %s is not defined... continuing.' % name) # Remove user after destroy domain to force logout 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=15*60) + 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)