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
Labels
Merge Requests
106
Merge Requests
106
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
82126f24
Commit
82126f24
authored
2 years ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
recipe.request*: fix naming of shared= argument
parent
9c4bbaa5
master
1.0
backup
bbu
cert-auto
check_system_gfortran
default_software_type_default
drupal-lamp
e2e
e2e-ors
erp5-component
erp5-zope2-tests
extend-erp5-wcfs-integration-tests
feat/buildout_testing_python3_new
feat/erp5-incremenatal-repozo
feat/inkscape-1.3
feat/libreoffice-24.2
feat/libreoffice-7.6
feat/mariadb-10.11
feat/mariadb-10.11-unsafe
feat/mariadb-10.11bis
feat/mariadb-10.11ter
feat/mariadb-10.5
feat/mariadb-10.6
feat/mariadb-11.4
feat/mariadb-11.4-unsafe
feat/new_vps_software
feat/nxdbom
feat/obs_test
feat/openssl-3.0
feat/openssl-3.0-bis
feat/openssl-3.0-py2
feat/telegraf-version-up
feat/version_up_ldap_graphviz
feat/zope-testrunner
feat/zope5.11-pygolang-zodbtools
fix-libdb
fix/erp5-haproxy-wait-reload
fix/gcc_min_version
fix/golang-20
fix/haproxy-up
fix/netrc-parse-error
fix/re6st-token-manager
fix/slapos.toolbox-py2
fix/version_up
for_testrunner_1
gitlab-v14.10
intentially_broken_cloudooo
jm
master+ZODB4-wc2
matomo-tutorial
neo-reflink
netframe
nextcloud-fix-tests
nirina_tutorial
nofile
old-mail-server
ors-amarisoft/aw2s
ors-dev
ors-dev2
ors-dev3
ors-dev3-bak
ors-dnsmasq
ors-fake-lteenb
ors-handover
ors-oran-ru
ors-oran-ru-toolbox
ors-promise
ors-ptt
ors-ssb-nr-arfcn
ors-test
ors-ue
osc
patrowl-dev
public-deltachat-core
push-to-wendolin
python3.12
remove_inkscape
ru-alarms
simpleran-dev
slapos-node_python3.9
slapos_master_load_balancer_test
sozu-dev
tdd_config_5ms_6ul_3dl
telecom-matomo-hotfix
textsynth
tomo_openradio_e2e_testing
top-stand1
vanilla-slapos
webdav
wrapper
xy/lte-multiru
y/wc2-next
zope2py2-reorder-versions-priority
zope2zope4py2
zope4py2-faketime
zope4py3
zope4py3-bstr
zope4py3-kaz
1.0.396
1.0.395
1.0.394
1.0.393
1.0.392
1.0.391
1.0.390
1.0.389
1.0.388
1.0.387
1.0.386
1.0.385
1.0.384
1.0.383
1.0.382
1.0.381
1.0.380
1.0.379
1.0.378
1.0.377
1.0.376
1.0.375
1.0.374
1.0.373
1.0.372
1.0.371
1.0.370
1.0.369
1.0.368
1.0.367
1.0.366
1.0.365
1.0.364.3
1.0.364.2
1.0.364.1
1.0.364
1.0.363
1.0.362
1.0.361
1.0.360
1.0.359
1.0.358
1.0.357
1.0.356
1.0.355
1.0.354
1.0.354-mariadb-replication-efc8bfe3c
1.0.354-mariadb-replication-8b12a75b5
1.0.353
1.0.352
1.0.351
1.0.350
1.0.349
1.0.348
1.0.347
1.0.346
1.0.345
1.0.344.1
1.0.344
1.0.343
1.0.342
1.0.341
1.0.340
1.0.339
1.0.338
1.0.337
1.0.336
1.0.335
1.0.334
1.0.333
1.0.332
1.0.331
1.0.330
1.0.329
1.0.328
1.0.327
1.0.326
1.0.325
1.0.324
1.0.323
1.0.322
1.0.321
1.0.320
1.0.319
1.0.318
1.0.317
1.0.316
1.0.315
1.0.314
1.0.313
1.0.312
1.0.311
1.0.310
1.0.309
1.0.308
1.0.307
1.0.306
1.0.305
1.0.304
1.0.303
1.0.302
1.0.301
1.0.300
1.0.299
1.0.298
1.0.297
1.0.296
1.0.295
1.0.294
1.0.293
1.0.292
1.0.291
No related merge requests found
Changes
1
Hide 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
)
)
...
...
This diff is collapsed.
Click to expand it.
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