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
Léo-Paul Géneau
slapos
Commits
82126f24
Commit
82126f24
authored
Oct 15, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
recipe.request*: fix naming of shared= argument
parent
9c4bbaa5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
slapos/recipe/request.py
slapos/recipe/request.py
+7
-7
No files found.
slapos/recipe/request.py
View file @
82126f24
...
...
@@ -65,8 +65,8 @@ class Recipe(object):
Software type of requested instance, among those provided by the
definition from software-url.
s
lave
(optional, defaults to false)
Set to "true" when requesting a s
lave
instance, ie just setting a set of
s
hared
(optional, defaults to false)
Set to "true" when requesting a s
hared
instance, ie just setting a set of
parameters in an existing instance.
sla (optional)
...
...
@@ -119,7 +119,7 @@ class Recipe(object):
partition_parameter_kw
=
self
.
_filterForStorage
({
k
[
7
:]:
v
for
k
,
v
in
six
.
iteritems
(
options
)
if
k
.
startswith
(
'config-'
)})
s
lave
=
options
.
get
(
'slave
'
,
'false'
).
lower
()
in
\
s
hared
=
options
.
get
(
'shared
'
,
'false'
).
lower
()
in
\
librecipe
.
GenericBaseRecipe
.
TRUE_VALUES
# By default, propagate the state of the parent instance
...
...
@@ -162,12 +162,12 @@ class Recipe(object):
try
:
self
.
instance
=
request
(
software_url
,
software_type
,
name
,
partition_parameter_kw
=
partition_parameter_kw
,
filter_kw
=
filter_kw
,
shared
=
s
lave
,
state
=
requested_state
)
filter_kw
=
filter_kw
,
shared
=
s
hared
,
state
=
requested_state
)
return_parameter_dict
=
self
.
_getReturnParameterDict
(
self
.
instance
,
return_parameters
)
# Fetch the instance-guid and the instance-state
# Note: SlapOS Master does not support it for s
lave
instances
if
not
s
lave
:
# Note: SlapOS Master does not support it for s
hared
instances
if
not
s
hared
:
try
:
options
[
'instance-guid'
]
=
self
.
instance
.
getInstanceGuid
()
\
.
encode
(
'UTF-8'
)
...
...
@@ -189,7 +189,7 @@ class Recipe(object):
request_name
=
name
,
partition_parameter_kw
=
partition_parameter_kw
,
filter_kw
=
filter_kw
,
shared
=
s
lave
,
shared
=
s
hared
,
state
=
requested_state
)
)
...
...
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