Update lxc software release to new recipes

software/lxc/instance-lxc.cfg

@@ -5,8 +5,9 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
 parts =
-    slapcontainer
     rootfs
+    uuid
+    lxc-conf
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -18,19 +19,27 @@ srv = $${buildout:directory}/srv
 recipe = slapos.cookbook:mkdirectory
 services = $${rootdirectory:etc}/run
 
-[slapcontainer]
-recipe = slapos.cookbook:slapcontainer
-interface = $${slap-network-information:network-interface}
-config = $${buildout:directory}/.slapcontainer
-lxc-config = $${rootdirectory:etc}/lxc.conf
-image = $${rootfs:downloaded-image}
-image-complete = $${rootfs:downloaded-image-complete}
-tmp-dir = $${rootdirectory:tmp}/slapcontainer/
-
 [rootfs]
-recipe = slapos.cookbook:rootfs
-image-url = $${slap-parameter:rootfs}
-downloaded-image = $${rootdirectory:srv}/rootfs.img
-downloaded-image-complete = $${:downloaded-image}.complete
+recipe = slapos.cookbook:downloader
+url = $${slap-parameter:rootfs}
+md5sum = $${slap-parameter:rootfs-md5sum}
+downloaded-file = $${rootdirectory:srv}/rootfs.img
+downloaded-file-complete = $${:downloaded-file}.complete
 binary = $${basedirectory:services}/rootfsdownload
 wget-binary = ${wget:location}/bin/wget
+
+[lxc-conf]
+recipe = slapos.cookbook:template
+template = ${lxc-conf-in:location}/${lxc-conf-in:filename}
+output = $${rootdirectory:etc}/lxc.conf
+bridge =
+interface = lxc$${slap-network-information:network-interface}
+name = $${uuid:uuid}
+rootfs = $${rootfs:downloaded-file}
+
+[uuid]
+recipe = slapos.cookbook:uuid
+cache-file = $${buildout:directory}/.slapcontainername
+
+[slap-parameter]
+rootfs-md5sum =

software/lxc/lxc.conf.in

+lxc.utsname = %(name)s
+
+lxc.network.type = veth
+lxc.network.link = %(bridge)s
+lxc.network.veth.pair = %(interface)s
+lxc.network.name = eth0
+lxc.network.flags = up
+
+lxc.tty = 4
+lxc.pts = 1024
+
+lxc.cgroup.devices.deny = a
+lxc.cgroup.devices.allow = c 1:3 rwm
+lxc.cgroup.devices.allow = c 1:5 rwm
+lxc.cgroup.devices.allow = c 5:1 rwm
+lxc.cgroup.devices.allow = c 5:0 rwm
+lxc.cgroup.devices.allow = c 4:0 rwm
+lxc.cgroup.devices.allow = c 4:1 rwm
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:8 rwm
+lxc.cgroup.devices.allow = c 136:* rwm
+lxc.cgroup.devices.allow = c 5:2 rwm
+lxc.cgroup.devices.allow = c 254:0 rwm
+
+lxc.rootfs = %(rootfs)s

software/lxc/software.cfg

@@ -14,6 +14,7 @@ parts =
   lxml-python
   template
   template-lxc
+  lxc-conf-in
   slapos-cookbook
   slapos-toolbox
   lxc
@@ -28,10 +29,17 @@ mode = 0644
 [template-lxc]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-lxc.cfg
-md5sum = d8e6bdee05b602c63de821c2f92a660f
+md5sum = 24eadd1159b95040648abfec4c5f332e
 output = ${buildout:directory}/template-lxc.cfg
 mode = 0644
 
+[lxc-conf-in]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = lxc.conf.in
+download-only = true
+md5sum = e9e6b23609a522d55ef44fb8efd87b44
+
 [slapos-toolbox]
 recipe = zc.recipe.egg
 scripts = slapcontainer