Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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
Eric Zheng
SlapOS Develop
Commits
3aafe1c2
Commit
3aafe1c2
authored
Sep 24, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reuse TRUE_VALUES already defined
parent
53f43215
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
slapos/recipe/request.py
slapos/recipe/request.py
+4
-2
No files found.
slapos/recipe/request.py
View file @
3aafe1c2
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
import
logging
import
logging
from
slapos
import
slap
as
slapmodule
from
slapos
import
slap
as
slapmodule
import
slapos.recipe.librecipe.generic
as
librecipe
DEFAULT_SOFTWARE_TYPE
=
'RootSoftwareInstance'
DEFAULT_SOFTWARE_TYPE
=
'RootSoftwareInstance'
...
@@ -99,8 +100,6 @@ class Recipe(object):
...
@@ -99,8 +100,6 @@ class Recipe(object):
request
=
slap
.
registerComputerPartition
(
request
=
slap
.
registerComputerPartition
(
options
[
'computer-id'
],
options
[
'partition-id'
]).
request
options
[
'computer-id'
],
options
[
'partition-id'
]).
request
isSlave
=
options
.
get
(
'slave'
,
''
).
lower
()
in
[
'y'
,
'yes'
,
'true'
,
'1'
]
print
'
\
n
Slave : %s
\
n
'
%
self
.
isSlave
return_parameters
=
[]
return_parameters
=
[]
self
.
return_parameters
=
[]
self
.
return_parameters
=
[]
if
'return'
in
options
:
if
'return'
in
options
:
...
@@ -126,6 +125,9 @@ class Recipe(object):
...
@@ -126,6 +125,9 @@ class Recipe(object):
print
'requested %s (%s), parameters : %s
\
n
\
n
'
%
(
options
[
'name'
],
print
'requested %s (%s), parameters : %s
\
n
\
n
'
%
(
options
[
'name'
],
software_type
,
software_type
,
partition_parameter_kw
)
partition_parameter_kw
)
isSlave
=
options
.
get
(
'slave'
,
''
).
lower
()
in
\
librecipe
.
GenericBaseRecipe
.
TRUE_VALUES
self
.
instance
=
instance
=
request
(
software_url
,
software_type
,
self
.
instance
=
instance
=
request
(
software_url
,
software_type
,
name
,
partition_parameter_kw
=
partition_parameter_kw
,
name
,
partition_parameter_kw
=
partition_parameter_kw
,
filter_kw
=
filter_kw
,
shared
=
isSlave
)
filter_kw
=
filter_kw
,
shared
=
isSlave
)
...
...
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