X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=d4335c4a831ee06754c2ef6c3f0dc53af466527b;hb=6ea3876af57fbc4f533de28941dc19a90b3a7be2;hp=9c88538558c863771edac730ad2469739b64133d;hpb=dd451f27a57f53eb716aaf3ff9b545953df8882a;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 9c88538..d4335c4 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -6,19 +6,20 @@ import subprocess
 import sys
 import os, os.path
 import grp
+from pwd import getpwnam
 from string import Template
 
 import libvirt
 
 import logger
-import 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'
@@ -90,10 +91,15 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         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"""
         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...
 
@@ -129,6 +135,33 @@ 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)
+            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))
+
         # 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 +174,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