Commit 80292a63 authored by Antoine Catton's avatar Antoine Catton

Update lxc software release to new recipes

parent d1e1a328
...@@ -5,8 +5,9 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -5,8 +5,9 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
parts = parts =
slapcontainer
rootfs rootfs
uuid
lxc-conf
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -18,19 +19,27 @@ srv = $${buildout:directory}/srv ...@@ -18,19 +19,27 @@ srv = $${buildout:directory}/srv
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run 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] [rootfs]
recipe = slapos.cookbook:rootfs recipe = slapos.cookbook:downloader
image-url = $${slap-parameter:rootfs} url = $${slap-parameter:rootfs}
downloaded-image = $${rootdirectory:srv}/rootfs.img md5sum = $${slap-parameter:rootfs-md5sum}
downloaded-image-complete = $${:downloaded-image}.complete downloaded-file = $${rootdirectory:srv}/rootfs.img
downloaded-file-complete = $${:downloaded-file}.complete
binary = $${basedirectory:services}/rootfsdownload binary = $${basedirectory:services}/rootfsdownload
wget-binary = ${wget:location}/bin/wget 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 =
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
...@@ -14,6 +14,7 @@ parts = ...@@ -14,6 +14,7 @@ parts =
lxml-python lxml-python
template template
template-lxc template-lxc
lxc-conf-in
slapos-cookbook slapos-cookbook
slapos-toolbox slapos-toolbox
lxc lxc
...@@ -28,10 +29,17 @@ mode = 0644 ...@@ -28,10 +29,17 @@ mode = 0644
[template-lxc] [template-lxc]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-lxc.cfg url = ${:_profile_base_location_}/instance-lxc.cfg
md5sum = d8e6bdee05b602c63de821c2f92a660f md5sum = 24eadd1159b95040648abfec4c5f332e
output = ${buildout:directory}/template-lxc.cfg output = ${buildout:directory}/template-lxc.cfg
mode = 0644 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] [slapos-toolbox]
recipe = zc.recipe.egg recipe = zc.recipe.egg
scripts = slapcontainer scripts = slapcontainer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment