X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=f2521a3311cb03f34448ff82393e9ab41393b89b;hb=da86cf851cca445bee8da1d495cca83ec196bb13;hp=212b7e63b00a2895b50a47195b58993dbdd433f0;hpb=0214164541351badc2c248962ee2cbd756d8e8a7;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index 212b7e6..f2521a3 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -18,7 +18,7 @@ from sliver_libvirt import Sliver_Libvirt class Sliver_LXC(Sliver_Libvirt, Initscript): """This class wraps LXC commands""" - SHELL = '/bin/vsh' + SHELL = '/usr/sbin/vsh' TYPE = 'sliver.LXC' # Need to add a tag at myplc to actually use this account # type = 'sliver.LXC' @@ -146,10 +146,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