Commit ee7860ee authored by Vincent Pelletier's avatar Vincent Pelletier

fixup! Jinja2-ify instance.cfg, tidstorage and cloudooo.

Download tidstorage and cloudooo templates during slapgrid-sr rather than
during slapgrid-cp.
parent 816550d8
......@@ -16,7 +16,6 @@ cert = ${slap-connection:cert-file}
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
template = {{ profile_base_location }}/${:filename}.in
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
extra-context =
context =
......@@ -48,8 +47,8 @@ buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-tidstorage]
< = jinja2-template-base
template = {{ template_tidstorage }}
filename = instance-tidstorage.cfg
md5sum = 5c3e834bf60819cf52995630e563227c
extensions = jinja2.ext.do
extra-context =
section parameter_dict dynamic-template-tidstorage-parameters
......@@ -81,8 +80,8 @@ buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-cloudooo]
< = jinja2-template-base
template = {{ template_cloudooo }}
filename = instance-cloudoo.cfg
md5sum = aea927d5d3363177fd1017c4b89838d7
extra-context =
section parameter_dict dynamic-template-cloudooo-parameters
import json_module json
......
......@@ -121,12 +121,23 @@ extra-context =
key kumo_location kumo:location
key logrotate_location logrotate:location
[template-tidstorage]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = 5c3e834bf60819cf52995630e563227c
[template-cloudooo]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum = aea927d5d3363177fd1017c4b89838d7
[template]
< = template-jinja2-base
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 29e6514746ec06708d1dd9fe600f653b
md5sum = f29ed1d32b66627ed3874b2e8474ce71
extra-context =
key apache_location apache:location
key buildout_bin_directory buildout:bin-directory
......@@ -158,14 +169,15 @@ extra-context =
key pdftk_location pdftk:location
key poppler_location poppler:location
key product_list products:list
key profile_base_location :_profile_base_location_
key sed_location sed:location
key template_erp5_development template-erp5-development:rendered
key template_erp5_production template-erp5-production:rendered
key template_kumofs template-kumofs:rendered
key template_mariadb template-mariadb:rendered
key template_memcached template-memcached:rendered
key template_cloudooo template-cloudooo:target
key template_sphinx template-sphinx:rendered
key template_tidstorage template-tidstorage:target
key template_varnish template-varnish:rendered
key template_zope template-zope:rendered
key tesseract_location tesseract:location
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment