X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=4aa6a21ecd0675c69e8a0c26ac1b2ee74cb2ca6b;hb=605b4ac989b43eba6768cf7dc285ffc19a47e7f1;hp=f7019649c91f63ad0ae26753531226987b8cf496;hpb=931588ce80de75383b980a3eab806a60396364ba;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index f701964..4aa6a21 100644 --- 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 + + 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)) @@ -209,7 +217,7 @@ unset pathmunge 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