X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=d3e077ffa1e6b29b381f56749f18fe9b036914a5;hb=e0f1c487a95f8fdcff6aedbedaf0f5bbef9b4413;hp=0f264649d2ece3ddd1ed017da1ca469195bff32f;hpb=532018958c875717df938661e5e36d06d2cf5053;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 0f26464..d3e077f 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -6,17 +6,19 @@ import subprocess
 import sys
 import os, os.path
 import grp
-import libvirt
 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):
+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'
@@ -24,6 +26,37 @@ class Sliver_LXC(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 '''
@@ -57,10 +90,15 @@ class Sliver_LXC(Sliver_Libvirt):
         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...