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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhifan huang
slapos
Commits
a7c0ff1e
Commit
a7c0ff1e
authored
Aug 24, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove slapos.cookbook:template dependency from lxc
parent
4195f78b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
software/lxc/instance-lxc.cfg
software/lxc/instance-lxc.cfg
+2
-5
software/lxc/lxc.conf.in
software/lxc/lxc.conf.in
+5
-5
software/lxc/software.cfg
software/lxc/software.cfg
+2
-2
No files found.
software/lxc/instance-lxc.cfg
View file @
a7c0ff1e
...
@@ -57,14 +57,11 @@ path = ${tar:location}/bin/:${gzip:location}/bin/:${bzip2:location}/bin/:${xz-ut
...
@@ -57,14 +57,11 @@ path = ${tar:location}/bin/:${gzip:location}/bin/:${bzip2:location}/bin/:${xz-ut
archive = true
archive = true
[lxc-conf]
[lxc-conf]
recipe = slapos.
cookbook:
template
recipe = slapos.
recipe.
template
template
= ${lxc-conf-in:location}/${lxc-conf-in:filename}
url
= ${lxc-conf-in:location}/${lxc-conf-in:filename}
output = $${rootdirectory:etc}/lxc.conf
output = $${rootdirectory:etc}/lxc.conf
bridge = !!BRIDGE_NAME!!
bridge = !!BRIDGE_NAME!!
interface = lxc$${slap-network-information:network-interface}
interface = lxc$${slap-network-information:network-interface}
name = $${uuid:uuid}
rootfs = $${rootfs:downloaded-file}
requested = $${slap-connection:requested}
[passwd]
[passwd]
recipe = slapos.cookbook:pwgen
recipe = slapos.cookbook:pwgen
...
...
software/lxc/lxc.conf.in
View file @
a7c0ff1e
#
%(requested)s
#
${slap-connection:requested}
lxc.utsname =
%(name)s
lxc.utsname =
${uuid:uuid}
lxc.network.type = veth
lxc.network.type = veth
lxc.network.link =
%(bridge)s
lxc.network.link =
${:bridge}
lxc.network.veth.pair =
%(interface)s
lxc.network.veth.pair =
${:interface}
lxc.network.name = eth0
lxc.network.name = eth0
lxc.network.flags = up
lxc.network.flags = up
...
@@ -24,6 +24,6 @@ lxc.cgroup.devices.allow = c 136:* rwm
...
@@ -24,6 +24,6 @@ lxc.cgroup.devices.allow = c 136:* rwm
lxc.cgroup.devices.allow = c 5:2 rwm
lxc.cgroup.devices.allow = c 5:2 rwm
lxc.cgroup.devices.allow = c 254:0 rwm
lxc.cgroup.devices.allow = c 254:0 rwm
lxc.rootfs =
%(rootfs)s
lxc.rootfs =
${rootfs:downloaded-file}
lxc.cap.drop = sys_module sys_time sys_chroot mknod
lxc.cap.drop = sys_module sys_time sys_chroot mknod
software/lxc/software.cfg
View file @
a7c0ff1e
...
@@ -36,7 +36,7 @@ mode = 0644
...
@@ -36,7 +36,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 =
27b9c3a9013beda84b336ea603e306bf
md5sum =
056912602caa71a2af9fcae97ee6dfb9
output = ${buildout:directory}/template-lxc.cfg
output = ${buildout:directory}/template-lxc.cfg
mode = 0644
mode = 0644
...
@@ -44,7 +44,7 @@ mode = 0644
...
@@ -44,7 +44,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
filename = lxc.conf.in
filename = lxc.conf.in
md5sum =
e47acb30a9783d2f264b51b3c46262ae
md5sum =
b25334fc369e4e0f608bc64f14b0315d
download-only = true
download-only = true
[slapos-toolbox]
[slapos-toolbox]
...
...
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