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'
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...
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