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
privatebridge belongs in lxc only
[nodemanager.git]
/
sliver_lxc.py
diff --git
a/sliver_lxc.py
b/sliver_lxc.py
index
f701964
..
4aa6a21
100644
(file)
--- a/
sliver_lxc.py
+++ b/
sliver_lxc.py
@@
-69,6
+69,14
@@
class Sliver_LXC(Sliver_Libvirt, Initscript):
# pldistro = lxc
# fcdistro = squeeze
# arch x86_64
# pldistro = lxc
# fcdistro = squeeze
# arch x86_64
+
+ arch = 'x86_64'
+ tags = rec['rspec']['tags']
+ if 'arch' in tags:
+ arch = tags['arch']
+ if arch == 'i386':
+ arch = 'i686'
+
vref = rec['vref']
if vref is None:
logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
vref = rec['vref']
if vref is None:
logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
@@
-209,7
+217,7
@@
unset pathmunge
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, interfaces=interfaces)
+ xml = template.substitute(name=name, interfaces=interfaces
, arch=arch
)
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