Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
f7eebb0c
Commit
f7eebb0c
authored
Aug 07, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put the instance status into lxc.conf
parent
15a75cf3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
slapos/recipe/softwaretype.py
slapos/recipe/softwaretype.py
+2
-0
software/lxc/instance-lxc.cfg
software/lxc/instance-lxc.cfg
+1
-0
software/lxc/lxc.conf.in
software/lxc/lxc.conf.in
+2
-0
software/lxc/software.cfg
software/lxc/software.cfg
+2
-2
No files found.
slapos/recipe/softwaretype.py
View file @
f7eebb0c
...
@@ -128,6 +128,8 @@ class Recipe:
...
@@ -128,6 +128,8 @@ class Recipe:
for
key
,
value
in
self
.
buildout
[
'slap_connection'
].
iteritems
():
for
key
,
value
in
self
.
buildout
[
'slap_connection'
].
iteritems
():
# XXX: Waiting for SlapBaseRecipe to use dash instead of underscores
# XXX: Waiting for SlapBaseRecipe to use dash instead of underscores
buildout
.
set
(
'slap-connection'
,
key
.
replace
(
'_'
,
'-'
),
value
)
buildout
.
set
(
'slap-connection'
,
key
.
replace
(
'_'
,
'-'
),
value
)
# XXX: Needed for lxc. Use non standard API
buildout
.
set
(
'slap-connection'
,
'requested'
,
self
.
computer_partition
.
_requested_state
)
work_directory
=
os
.
path
.
abspath
(
self
.
buildout
[
'buildout'
][
work_directory
=
os
.
path
.
abspath
(
self
.
buildout
[
'buildout'
][
'directory'
])
'directory'
])
...
...
software/lxc/instance-lxc.cfg
View file @
f7eebb0c
...
@@ -36,6 +36,7 @@ bridge = $${slap-connection:bridge-name}
...
@@ -36,6 +36,7 @@ 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}
requested = $${slap-connection:requested}
[uuid]
[uuid]
recipe = slapos.cookbook:uuid
recipe = slapos.cookbook:uuid
...
...
software/lxc/lxc.conf.in
View file @
f7eebb0c
# %(requested)s
lxc.utsname = %(name)s
lxc.utsname = %(name)s
lxc.network.type = veth
lxc.network.type = veth
...
...
software/lxc/software.cfg
View file @
f7eebb0c
...
@@ -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 =
7be7335c6d6d26a6e1f22717bba89769
md5sum =
5ecbded7dacfa66964a2172bbfddfb5f
output = ${buildout:directory}/template-lxc.cfg
output = ${buildout:directory}/template-lxc.cfg
mode = 0644
mode = 0644
...
@@ -37,8 +37,8 @@ mode = 0644
...
@@ -37,8 +37,8 @@ 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 = 47cf7520c17c964d4d93608d6785a6a3
download-only = true
download-only = true
md5sum = e9e6b23609a522d55ef44fb8efd87b44
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
...
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