git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag nodemanager-2.1-13
[nodemanager.git]
/
sliver_lxc.py
diff --git
a/sliver_lxc.py
b/sliver_lxc.py
index
b398448
..
f2521a3
100644
(file)
--- 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"""
class Sliver_LXC(Sliver_Libvirt, Initscript):
"""This class wraps LXC commands"""
- SHELL = '/
bin/ssh
sh'
+ SHELL = '/
usr/sbin/v
sh'
TYPE = 'sliver.LXC'
# Need to add a tag at myplc to actually use this account
# type = 'sliver.LXC'
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
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())
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
except IOError:
logger.log('Failed to parse or use XML template file %s'%template_filename)
return