Commit e9c459d1 authored by Antoine Catton's avatar Antoine Catton

Update lxc/instance-lxc.cfg

This is made to be compatible with modifications :
  - 377c6db729
  - a3370049ad
  - c26729e0425
parent 97d5f9c3
...@@ -6,6 +6,9 @@ offline = true ...@@ -6,6 +6,9 @@ offline = true
parts = parts =
slapcontainer slapcontainer
rootfs
publish
slapcontainer-promise
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -25,16 +28,28 @@ interface = $${slap-network-information:network-interface} ...@@ -25,16 +28,28 @@ interface = $${slap-network-information:network-interface}
config = $${buildout:directory}/.slapcontainer config = $${buildout:directory}/.slapcontainer
lxc-config = $${buildout:directory}/config lxc-config = $${buildout:directory}/config
archive = $${rootfs:downloaded-archive} archive = $${rootfs:downloaded-archive}
archive-complete = $${rootfs:downloaded-archive-complete}
tmp-dir = $${rootdirectory:tmp}/slapcontainer/ tmp-dir = $${rootdirectory:tmp}/slapcontainer/
config-file = $${buildout:directory}/config config-file = $${buildout:directory}/config
rootfs = $${rootfs:rootfs} rootfs = $${buildout:directory}/rootfs
tar-binary = ${tar:location}/bin/tar tar-binary = ${tar:location}/bin/tar
tar-path = ${tar:location}/bin:${gzip:location}/bin:${bzip2:location}/bin:${xz-utils:location}/bin tar-path = ${tar:location}/bin:${gzip:location}/bin:${bzip2:location}/bin:${xz-utils:location}/bin
[slapcontainer-promise]
recipe = slapos.cookbook:slapcontainer.promise
promise = $${basedirectory:promises}/slapcontainer
lxc-info = ${lxc:location}/bin/lxc-info
slapcontainer-name = $${slapcontainer:slapcontainer-name}
[rootfs] [rootfs]
recipe = slapos.cookbook:rootfs recipe = slapos.cookbook:rootfs
archive-url = $${slap-parameter:rootfs} archive-url = $${slap-parameter:rootfs}
downloaded-archive = $${rootdirectory:tmp}/rootfs.tar.gz downloaded-archive = $${rootdirectory:tmp}/rootfs.tar.gz
downloaded-archive-complete = $${rootdirectory:tmp}/rootfs.ok
binary = $${basedirectory:services}/rootfsdownload binary = $${basedirectory:services}/rootfsdownload
wget-binary = ${wget:location}/bin/wget wget-binary = ${wget:location}/bin/wget
rootfs = $${buildout:directory}/rootfs
[publish]
recipe = slapos.cookbook:publish
ip = $${slap-network-information:global-ipv6}
...@@ -29,7 +29,7 @@ mode = 0644 ...@@ -29,7 +29,7 @@ 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 = 4938f17f8cac89a3c222c22530b2354f md5sum = e2f2dd3dbbd2aa886aa64823238d1cfe
output = ${buildout:directory}/template-lxc.cfg output = ${buildout:directory}/template-lxc.cfg
mode = 0644 mode = 0644
......
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