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
Cédric Le Ninivin
slapos
Commits
a3bee13e
Commit
a3bee13e
authored
Jun 26, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move instance-erp5-production.cfg.in rendering to slapgrid-cp time.
In preparation for better ERP5 clusterisation.
parent
56728231
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
9 deletions
+29
-9
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+6
-7
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-cluster.cfg.in
+2
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+21
-2
No files found.
stack/erp5/buildout.cfg
View file @
a3bee13e
...
@@ -238,7 +238,7 @@ mode = 640
...
@@ -238,7 +238,7 @@ mode = 640
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
700b8729a4d9a8423ab2a99de486cc31
md5sum =
bee6c2b640efee53e3b6e209127cb0bc
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
@@ -279,7 +279,7 @@ extra-context =
...
@@ -279,7 +279,7 @@ extra-context =
key sed_location sed:location
key sed_location sed:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
key template_erp5_single template-erp5-single:target
key template_erp5_single template-erp5-single:target
key template_erp5_cluster template-erp5-cluster:
rendered
key template_erp5_cluster template-erp5-cluster:
target
key template_kumofs template-kumofs:rendered
key template_kumofs template-kumofs:rendered
key template_mariadb template-mariadb:rendered
key template_mariadb template-mariadb:rendered
key template_memcached template-memcached:rendered
key template_memcached template-memcached:rendered
...
@@ -308,11 +308,10 @@ md5sum = 2a4312202a3160f874c4fa3ee9155a1d
...
@@ -308,11 +308,10 @@ md5sum = 2a4312202a3160f874c4fa3ee9155a1d
mode = 640
mode = 640
[template-erp5-cluster]
[template-erp5-cluster]
< = template-jinja2-base
recipe = slapos.recipe.build:download
filename = instance-erp5-cluster.cfg
url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
md5sum = b4a9688ca7983fac5dd573e66c6e4263
md5sum = eecde68b9a266d8883042540ac077839
extra-context =
mode = 640
key local_bt5_repository local-bt5-repository:list
[template-varnish]
[template-varnish]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
...
stack/erp5/instance-erp5-cluster.cfg.in
View file @
a3bee13e
{% if slap_software_type == software_type -%}
#############################
#############################
#
#
# Request erp5 production environnment
# Request erp5 production environnment
...
@@ -104,3 +105,4 @@ smtp-url = smtp://localhost:25/
...
@@ -104,3 +105,4 @@ smtp-url = smtp://localhost:25/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc/run
etc = ${buildout:directory}/etc/run
{% endif %}
stack/erp5/instance.cfg.in
View file @
a3bee13e
...
@@ -187,11 +187,30 @@ extra-context =
...
@@ -187,11 +187,30 @@ extra-context =
key template_zope dynamic-template-zope:rendered
key template_zope dynamic-template-zope:rendered
key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
[dynamic-template-cluster-parameters]
local-bt5-repository = {{ local_bt5_repository }}
[dynamic-template-cluster]
< = jinja2-template-base
template = {{ template_erp5_cluster }}
filename = instance-erp5-cluster.cfg
extra-context =
key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
# Must match the key id in [switch-softwaretype] which uses this section.
# XXX: it is dangerous to use buildout-style expansion in jinja context declaration
raw software_type ${:software-type}
software-type = cluster
# BBB: use "cluster" software type instead
[dynamic-template-production]
< = dynamic-template-cluster
software-type = production
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${template-erp5-single:rendered}
default = ${template-erp5-single:rendered}
production =
{{ template_erp5_cluster }
}
production =
${dynamic-template-production:rendered
}
cluster =
{{ template_erp5_cluster }
}
cluster =
${dynamic-template-cluster:rendered
}
kumofs = {{ template_kumofs }}
kumofs = {{ template_kumofs }}
memcached = {{ template_memcached }}
memcached = {{ template_memcached }}
cloudooo = ${dynamic-template-cloudooo:rendered}
cloudooo = ${dynamic-template-cloudooo:rendered}
...
...
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