From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 24 May 2013 18:50:50 +0000 (-0400)
Subject: Add setting machine architecture for container
X-Git-Tag: nodemanager-5.2-3~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=95bca61d9de72d428fe0054596b0faf952e0bc5b

Add setting machine architecture for container
---

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