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
Gabriel Monnerat
slapos
Commits
69b53acc
Commit
69b53acc
authored
Aug 01, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove promise
parent
84ac80ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
39 deletions
+1
-39
setup.py
setup.py
+0
-1
slapos/recipe/container.py
slapos/recipe/container.py
+0
-29
software/lxc/instance-lxc.cfg
software/lxc/instance-lxc.cfg
+0
-8
software/lxc/software.cfg
software/lxc/software.cfg
+1
-1
No files found.
setup.py
View file @
69b53acc
...
@@ -110,7 +110,6 @@ setup(name=name,
...
@@ -110,7 +110,6 @@ setup(name=name,
'siptester = slapos.recipe.siptester:SipTesterRecipe'
,
'siptester = slapos.recipe.siptester:SipTesterRecipe'
,
'simplelogger = slapos.recipe.simplelogger:Recipe'
,
'simplelogger = slapos.recipe.simplelogger:Recipe'
,
'slapcontainer = slapos.recipe.container:Recipe'
,
'slapcontainer = slapos.recipe.container:Recipe'
,
'slapcontainer.promise = slapos.recipe.container:Promise'
,
'slaprunner = slapos.recipe.slaprunner:Recipe'
,
'slaprunner = slapos.recipe.slaprunner:Recipe'
,
'slapmonitor = slapos.recipe.slapmonitor:Recipe'
,
'slapmonitor = slapos.recipe.slapmonitor:Recipe'
,
'slapreport = slapos.recipe.slapreport:Recipe'
,
'slapreport = slapos.recipe.slapreport:Recipe'
,
...
...
slapos/recipe/container.py
View file @
69b53acc
...
@@ -39,35 +39,6 @@ import subprocess
...
@@ -39,35 +39,6 @@ import subprocess
from
slapos.recipe.librecipe
import
GenericSlapRecipe
from
slapos.recipe.librecipe
import
GenericSlapRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
def
promise_func
(
args
):
output
=
subprocess
.
check_output
(
[
args
[
'lxc-info'
],
'-n'
,
args
[
'name'
]]
)
if
'RUNNING'
in
output
:
return
0
else
:
return
127
class
Promise
(
GenericBaseRecipe
):
def
install
(
self
):
return
[
self
.
createPythonScript
(
self
.
options
[
'promise'
],
'slapos.recipe.container.promise_func'
,
{
'lxc-info'
:
self
.
options
[
'lxc-info'
],
'name'
:
self
.
options
[
'slapcontainer-name'
]
}
)
]
class
Recipe
(
GenericSlapRecipe
):
class
Recipe
(
GenericSlapRecipe
):
def
_options
(
self
,
options
):
def
_options
(
self
,
options
):
...
...
software/lxc/instance-lxc.cfg
View file @
69b53acc
...
@@ -7,7 +7,6 @@ offline = true
...
@@ -7,7 +7,6 @@ offline = true
parts =
parts =
slapcontainer
slapcontainer
rootfs
rootfs
slapcontainer-promise
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -18,7 +17,6 @@ srv = $${buildout:directory}/srv
...
@@ -18,7 +17,6 @@ srv = $${buildout:directory}/srv
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run
services = $${rootdirectory:etc}/run
promises = $${rootdirectory:etc}/promise
[slapcontainer]
[slapcontainer]
recipe = slapos.cookbook:slapcontainer
recipe = slapos.cookbook:slapcontainer
...
@@ -29,12 +27,6 @@ image = $${rootfs:downloaded-image}
...
@@ -29,12 +27,6 @@ image = $${rootfs:downloaded-image}
image-complete = $${rootfs:downloaded-image-complete}
image-complete = $${rootfs:downloaded-image-complete}
tmp-dir = $${rootdirectory:tmp}/slapcontainer/
tmp-dir = $${rootdirectory:tmp}/slapcontainer/
[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
image-url = $${slap-parameter:rootfs}
image-url = $${slap-parameter:rootfs}
...
...
software/lxc/software.cfg
View file @
69b53acc
...
@@ -28,7 +28,7 @@ mode = 0644
...
@@ -28,7 +28,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 =
901fd10e1404d10aa399b3dffcf68845
md5sum =
d8e6bdee05b602c63de821c2f92a660f
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