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
f1fe0e90
Commit
f1fe0e90
authored
Aug 06, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: resilient template render during instanciation
parent
6c7e54d9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
18 deletions
+29
-18
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-15
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+2
-2
software/slaprunner/instance.cfg
software/slaprunner/instance.cfg
+26
-1
No files found.
software/slaprunner/common.cfg
View file @
f1fe0e90
...
@@ -75,7 +75,7 @@ command =
...
@@ -75,7 +75,7 @@ command =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
md5sum =
5de75f295f9382a587343718bb1be124
md5sum =
1a4e2b9c9b870db64f40c5832d504f8c
mode = 0644
mode = 0644
[template-runner]
[template-runner]
...
@@ -85,20 +85,6 @@ output = ${buildout:directory}/template-runner.cfg
...
@@ -85,20 +85,6 @@ output = ${buildout:directory}/template-runner.cfg
md5sum = 7c08c0cd029e9b5ebfe30a10cd03f18d
md5sum = 7c08c0cd029e9b5ebfe30a10cd03f18d
mode = 0644
mode = 0644
[instance-resilient]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
rendered = ${buildout:directory}/instance-resilient.cfg
md5sum = 85c5acb951a6a24a552ce05a6dbe2aeb
context = key buildout buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
import-list = file parts template-parts:destination
file replicated template-replicated:destination
mode = 0644
[instance-runner-import]
[instance-runner-import]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-import.cfg.in
url = ${:_profile_base_location_}/instance-runner-import.cfg.in
...
...
software/slaprunner/instance-resilient.cfg.jinja2
View file @
f1fe0e90
...
@@ -13,7 +13,7 @@ parts +=
...
@@ -13,7 +13,7 @@ parts +=
{{ parts.replicate("runner", "3") }}
{{ parts.replicate("runner", "3") }}
publish-connection-informations
publish-connection-informations
{{ replicated.replicate("runner", "3", "runner-export", "runner-import") }}
{{ replicated.replicate("runner", "3", "runner-export", "runner-import"
, slapparameter_dict=slapparameter_dict
) }}
# Bubble up the parameters
# Bubble up the parameters
[request-runner]
[request-runner]
...
...
software/slaprunner/instance.cfg
View file @
f1fe0e90
...
@@ -9,10 +9,35 @@ offline = true
...
@@ -9,10 +9,35 @@ offline = true
[switch_softwaretype]
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${template-runner:output}
default = ${template-runner:output}
resilient = ${instance-resilient:rendered}
resilient = $
$
{instance-resilient:rendered}
runner = ${template-runner:output}
runner = ${template-runner:output}
runner-import = ${instance-runner-import:output}
runner-import = ${instance-runner-import:output}
runner-export = ${instance-runner-export:output}
runner-export = ${instance-runner-export:output}
frozen = ${instance-frozen:output}
frozen = ${instance-frozen:output}
pull-backup = ${template-pull-backup:output}
pull-backup = ${template-pull-backup:output}
[instance-resilient]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
rendered = $${buildout:directory}/instance-resilient.cfg
extensions = jinja2.ext.do
md5sum = fc253453da66583e7d515a6e2eb1475e
context = key buildout buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-parameters:configuration
template-parts-destination = ${template-parts:destination}
template-replicated-destination = ${template-replicated:destination}
import-list = file parts :template-parts-destination
file replicated :template-replicated-destination
mode = 0644
[slap-parameters]
recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
\ No newline at end of file
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