Skip to content

erp5
erp5
Commit 15a75cf3 authored by Antoine Catton's avatar Antoine Catton
Browse files
Options

Pass the bridge name to lxc.conf.in

parent 80292a63
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/lxc/instance-lxc.cfg
View file @ 15a75cf3
...@@ -32,7 +32,7 @@ wget-binary = ${wget:location}/bin/wget ...@@ -32,7 +32,7 @@ wget-binary = ${wget:location}/bin/wget
recipe = slapos.cookbook:template recipe = slapos.cookbook:template
template = ${lxc-conf-in:location}/${lxc-conf-in:filename} template = ${lxc-conf-in:location}/${lxc-conf-in:filename}
output = $${rootdirectory:etc}/lxc.conf output = $${rootdirectory:etc}/lxc.conf
bridge = bridge = $${slap-connection:bridge-name}
interface = lxc$${slap-network-information:network-interface} interface = lxc$${slap-network-information:network-interface}
name = $${uuid:uuid} name = $${uuid:uuid}
rootfs = $${rootfs:downloaded-file} rootfs = $${rootfs:downloaded-file}
......
software/lxc/software.cfg
View file @ 15a75cf3
...@@ -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 = 24eadd1159b95040648abfec4c5f332e md5sum = 7be7335c6d6d26a6e1f22717bba89769
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7