Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
aa2c24ca
Commit
aa2c24ca
authored
Oct 18, 2015
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wendelin: Use RequestOptional instead of Request recipe to let not ready instance not fail
parent
d4a90b46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
software/wendelin/instance-default.cfg.in
software/wendelin/instance-default.cfg.in
+7
-3
software/wendelin/instance.cfg.in
software/wendelin/instance.cfg.in
+7
-2
software/wendelin/software.cfg
software/wendelin/software.cfg
+2
-2
No files found.
software/wendelin/instance-default.cfg.in
View file @
aa2c24ca
...
@@ -27,13 +27,17 @@ cert_file = ${slap-connection:cert-file}
...
@@ -27,13 +27,17 @@ cert_file = ${slap-connection:cert-file}
[request-erp5]
[request-erp5]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:request
recipe = slapos.cookbook:request
optional
name = ERP5
name = ERP5
software-url = ${slap-connection:software-release-url}
software-url = ${slap-connection:software-release-url}
# For software-type 'default', we'll use 'wendelin-default' ST which has been
# defined in instance.cfg.in and is imitating the 'default' of erp5 stack
# That way we would request erp5 from wendelin almost similar to that we would
# be getting from erp5 stack. Same is for create-erp5-site ST
{% if slap_software_type=='default'-%}
{% if slap_software_type=='default'-%}
{% set software_type='
erp5-cluster
-default'-%}
{% set software_type='
wendelin
-default'-%}
{% elif slap_software_type=='create-erp5-site' -%}
{% elif slap_software_type=='create-erp5-site' -%}
{% set software_type='
erp5-cluster
-create-erp5-site'-%}
{% set software_type='
wendelin
-create-erp5-site'-%}
{% else -%}
{% else -%}
{% set software_type=slap_software_type -%}
{% set software_type=slap_software_type -%}
{% endif -%}
{% endif -%}
...
...
software/wendelin/instance.cfg.in
View file @
aa2c24ca
...
@@ -45,9 +45,14 @@ rendered = {{ template_jupyter }}
...
@@ -45,9 +45,14 @@ rendered = {{ template_jupyter }}
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
recipe = slapos.cookbook:switch-softwaretype
# For both software type 'default' and 'create-erp5-site', we want buildout for
# instance-default.cfg.in to run, so, we use same sections for them
default = dynamic-template-default:rendered
default = dynamic-template-default:rendered
create-erp5-site = dynamic-template-default:rendered
create-erp5-site = dynamic-template-default:rendered
jupyter = dynamic-template-jupyter:rendered
jupyter = dynamic-template-jupyter:rendered
erp5-cluster-create-erp5-site = dynamic-template-create-erp5-site:rendered
# Following 2 software-types imitate the instance for 'create-erp5-site' and 'default'
erp5-cluster-default = dynamic-template-erp5:rendered
# The request for them is being sent by the instance-default file which is being
# in the 'default' and 'create-erp5-site' above
wendelin-create-erp5-site = dynamic-template-create-erp5-site:rendered
wendelin-default = dynamic-template-erp5:rendered
\ No newline at end of file
software/wendelin/software.cfg
View file @
aa2c24ca
...
@@ -70,7 +70,7 @@ branch = erp5-data-notebook
...
@@ -70,7 +70,7 @@ branch = erp5-data-notebook
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/template.cfg
rendered = ${buildout:directory}/template.cfg
md5sum =
28a861b6edf15990ce9490dce6488ff3
md5sum =
42dc0a4e4c40acce0284eca264e1cb8c
mode = 0644
mode = 0644
context =
context =
key slapos_core_version versions:slapos.core
key slapos_core_version versions:slapos.core
...
@@ -93,7 +93,7 @@ rendered = ${buildout:directory}/template-jupyter.cfg
...
@@ -93,7 +93,7 @@ rendered = ${buildout:directory}/template-jupyter.cfg
[template-default]
[template-default]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-default.cfg.in
url = ${:_profile_base_location_}/instance-default.cfg.in
md5sum =
0a9aebe32b04226b95105c8d93369cf7
md5sum =
b4c789dc96c6a62e62ac33e98b114043
mode = 0644
mode = 0644
[template-publish-information]
[template-publish-information]
...
...
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