X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=37055986dd34ad82073f6e2542b46dd2bddbb86f;hb=cbe129e67722d4c042fd48d045ef43d8796381e8;hp=c409b329e66892970aba99804cb27c506e8a3ca9;hpb=4cea67f19270ef239d1fa352c5d8757c5fe5f09b;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index c409b32..3705598 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -15,6 +15,7 @@ import libvirt import logger import plnode.bwlimit as bwlimit from initscript import Initscript +from account import Account from sliver_libvirt import Sliver_Libvirt class Sliver_LXC(Sliver_Libvirt, Initscript): @@ -48,7 +49,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): # the generic /etc/init.d/vinit script is permanently refreshed, and enabled self.install_and_enable_vinit() # expose .ssh for omf_friendly slivers - if 'omf_control' in self.rspec['tags']: + if 'tags' in self.rspec and 'omf_control' in self.rspec['tags']: Account.mount_ssh_dir(self.name) Sliver_Libvirt.start (self, delay) # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice @@ -82,8 +83,8 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): vref = rec['vref'] if vref is None: - logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name)) vref = "lxc-f14-x86_64" + logger.log("sliver_libvirt: %s: WARNING - no vref attached, using hard-wired default %s" % (name,vref)) refImgDir = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR, vref) containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name) @@ -103,33 +104,6 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): 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""" - 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... # Set hostname. A valid hostname cannot have '_' @@ -189,12 +163,20 @@ unset pathmunge command = ['chown', name, '%s/home/%s' % (containerDir, name)] logger.log_call(command, timeout=10) etcpasswd = os.path.join(containerDir, 'etc/passwd') + etcgroup = os.path.join(containerDir, 'etc/group') if os.path.exists(etcpasswd): - logger.log("adding user %s id %d to %s" % (name, uid, etcpasswd)) + # create all accounts with gid=1001 - i.e. 'slices' like it is in the root context + slices_gid=1001 + logger.log("adding user %(name)s id %(uid)d gid %(slices_gid)d to %(etcpasswd)s" % (locals())) + try: + file(etcpasswd,'a').write("%(name)s:x:%(uid)d:%(slices_gid)d::/home/%(name)s:/bin/bash\n" % locals()) + except: + logger.log_exc("exception while updating %s"%etcpasswd) + logger.log("adding group slices with gid %(slices_gid)d to %(etcgroup)s"%locals()) try: - file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name)) + file(etcgroup,'a').write("slices:x:%(slices_gid)d\n"%locals()) except: - logger.log_exc("exception while updating etc/passwd") + logger.log_exc("exception while updating %s"%etcgroup) sudoers = os.path.join(containerDir, 'etc/sudoers') if os.path.exists(sudoers): try: @@ -202,6 +184,56 @@ unset pathmunge except: logger.log_exc("exception while updating /etc/sudoers") + # customizations for the user environment - root or slice uid + # we save the whole business in /etc/planetlab.profile + # and source this file for both root and the slice uid's .profile + # prompt for slice owner, + LD_PRELOAD for transparently wrap bind + pl_profile=os.path.join(containerDir,"etc/planetlab.profile") + ld_preload_text="""# 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_text="""# 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(pl_profile,'w') as f: + f.write("export PS1='%s@\H \$ '\n"%(name)) + f.write("%s\n"%ld_preload_text) + f.write("export LD_PRELOAD=/etc/planetlab/lib/bind_public.so\n") + f.write("%s\n"%usrmove_path_text) + f.write("%s\n"%usrmove_path_code) + + # make sure this file is sourced from both root's and slice's .profile + enforced_line = "[ -f /etc/planetlab.profile ] && source /etc/planetlab.profile\n" + for path in [ 'root/.profile', 'home/%s/.profile'%name ]: + from_root=os.path.join(containerDir,path) + # if dir is not yet existing let's forget it for now + if not os.path.isdir(os.path.dirname(from_root)): continue + found=False + try: + contents=file(from_root).readlines() + for content in contents: + if content==enforced_line: found=True + except IOError: pass + if not found: + with open(from_root,"a") as user_profile: + user_profile.write(enforced_line) + # in case we create the slice's .profile when writing + if from_root.find("/home")>=0: + command=['chown','%s:slices'%name,from_root] + logger.log_call(command,timeout=5) + # 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)