Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/nodemanager

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 432f426..c409b32 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -220,7 +220,7 @@ unset pathmunge
         try:
             with open(template_filename) as f:
                 template = Template(f.read())
-                xml  = template.substitute(name=name, interfaces=interfaces, arch=arch)
+                xml  = template.substitute(name=name, xid=xid, interfaces=interfaces, arch=arch)
         except IOError:
             logger.log('Failed to parse or use XML template file %s'%template_filename)
             return