Plugin for configuring network interfaces inside a container.

[nodemanager.git] / sliver_lxc.py

diff --git a/sliver_lxc.py b/sliver_lxc.py
index c2067a1..f2521a3 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -11,14 +11,14 @@ from string import Template
 import libvirt
 
 import logger
-import bwlimitlxc as 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'
@@ -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