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
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
isaak yansane-sisk
slapos
Commits
f1745637
Commit
f1745637
authored
Feb 25, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tentative to write lamp-generic in jinja.
parent
086b605c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
7 deletions
+69
-7
software/lamp-generic/instance-edge.cfg.jinja2
software/lamp-generic/instance-edge.cfg.jinja2
+33
-0
software/lamp-generic/instance.cfg.in
software/lamp-generic/instance.cfg.in
+30
-1
software/lamp-generic/software.cfg
software/lamp-generic/software.cfg
+6
-6
No files found.
software/lamp-generic/instance-edge.cfg.jinja2
0 → 100644
View file @
f1745637
# This instance will request other instances of lamp-generic depending on a
# list of countries.
[buildout]
parts =
request-edge
publish-connection-information
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
{% for country in country_list %}
[request-{{country}}]
recipe = request
software-url = ${slap-connection:software-release-url}
software-type = default
name = {{country}}
config = application-location
config-application-location = ${slap-parameter:application-location}
return = url backend-url
{% endfor %}
# XXX-Cedric: aggregate and send parameters
[publish-connection-information]
recipe = slapos.cookbook:publish
{% for country in country_list %}
{{ country }}-url = ${request-{{ country }}:connection_url}
{{ country }}-backend-url = ${request-{{ country }}:connection-backend_url}
{% endfor %}
software/lamp-generic/instance.cfg.in
View file @
f1745637
...
@@ -7,7 +7,36 @@ eggs-directory = ${buildout:eggs-directory}
...
@@ -7,7 +7,36 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
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}
[dynamic-template-cloudooo]
template = ${template-edge:target}
filename = instance-edge.cfg
extra-context =
key country_list slap-configuration:country-list
# section parameter_dict dynamic-template-cloudooo-parameters
# import json_module json
# Must match the key id in [switch-softwaretype] which uses this section.
# raw software_type edge
context =
key ipv4_set slap-configuration:ipv4
key ipv6_set slap-configuration:ipv6
key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
key slap_software_type slap-configuration:slap-software-type
key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer
${:extra-context}
[switch_softwaretype]
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${instance-apache-php:output}
default = ${instance-apache-php:output}
edge = ${instance-edge:output}
edge = ${instance-edge:output}
\ No newline at end of file
software/lamp-generic/software.cfg
View file @
f1745637
...
@@ -15,9 +15,9 @@ md5sum = 10c316c7a1c18ea1d26bf319b5dffed1
...
@@ -15,9 +15,9 @@ md5sum = 10c316c7a1c18ea1d26bf319b5dffed1
url = ${:_profile_base_location_}/instance-apache-php.cfg.in
url = ${:_profile_base_location_}/instance-apache-php.cfg.in
md5sum = 1ae55eb527eb0057e4ea798f96f0aa90
md5sum = 1ae55eb527eb0057e4ea798f96f0aa90
[
instanc
e-edge]
[
templat
e-edge]
recipe = slapos.recipe.template
# XXX-Cedric: use h.r.download
url = ${:_profile_base_location_}/instance-edge.cfg.in
recipe = slapos.recipe.build:download
output = ${buildout:directory}/instance.cfg
url = ${:_profile_base_location_}/instance-edge.cfg.jinja2
md5sum = 6b7a6caf44e3a94bed7f89c04003a171
#md5sum = 53492e520be57f4c6a9eacd107c8d446
mode =
0644
mode =
640
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