Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaohe Cao
slapos
Commits
15a75cf3
Commit
15a75cf3
authored
Aug 06, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the bridge name to lxc.conf.in
parent
80292a63
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
software/lxc/instance-lxc.cfg
software/lxc/instance-lxc.cfg
+1
-1
software/lxc/software.cfg
software/lxc/software.cfg
+1
-1
No files found.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment