X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=432f42644586970cc866775df426e50060569240;hb=37fb58922dd8b6429ccb4a2b94d4ca907ee83232;hp=7fcef281c5d8d7b87e82928f3e6f8747ee10ac52;hpb=834827443f52ebcf42f37664781e95a86f5c654b;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 7fcef28..432f426 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -47,6 +47,9 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
             return
         # 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']:
+            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
         self.refresh_slice_vinit()
@@ -69,6 +72,14 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         # pldistro = lxc
         # fcdistro = squeeze
         # arch x86_64
+
+        arch = 'x86_64'
+        tags = rec['rspec']['tags']
+        if 'arch' in tags:
+            arch = tags['arch']
+            if arch == 'i386':
+                arch = 'i686'
+
         vref = rec['vref']
         if vref is None:
             logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
@@ -87,7 +98,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)
@@ -97,10 +108,27 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         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...
 
@@ -133,9 +161,6 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         command = ['mkdir', '%s/root/.ssh'%containerDir]
         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=30)
 
@@ -166,10 +191,16 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
             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))
+                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):
-                file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name)
+                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
@@ -189,7 +220,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         try:
             with open(template_filename) as f:
                 template = Template(f.read())
-                xml  = template.substitute(name=name, interfaces=interfaces)
+                xml  = template.substitute(name=name, interfaces=interfaces, arch=arch)
         except IOError:
             logger.log('Failed to parse or use XML template file %s'%template_filename)
             return
@@ -205,6 +236,8 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
 
     @staticmethod
     def destroy(name):
+        # umount .ssh directory - only if mounted
+        Account.umount_ssh_dir(name)
         logger.verbose ('sliver_lxc: %s destroy'%(name))
         conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)