Commit 5962ee8d authored by Vincent Pelletier's avatar Vincent Pelletier

Use slapos.buildout "dumps" to pass python list to zope.conf.in template.

parent c2dae992
...@@ -336,7 +336,7 @@ recipe = slapos.cookbook:pwgen.stable ...@@ -336,7 +336,7 @@ recipe = slapos.cookbook:pwgen.stable
[zope-conf-parameter-base] [zope-conf-parameter-base]
ip = {{ ipv4 }} ip = {{ ipv4 }}
site-id = {{ site_id }} site-id = {{ site_id }}
zodb-list = {{ json_module.dumps(zodb_connection_list) }} zodb-list = {{ dumps(zodb_connection_list) }}
[zope-conf-base] [zope-conf-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -347,7 +347,6 @@ context = ...@@ -347,7 +347,6 @@ context =
key instance_products directory:instance-products key instance_products directory:instance-products
raw deadlock_path /manage_debug_threads raw deadlock_path /manage_debug_threads
key deadlock_debugger_password deadlock-debugger-password:password key deadlock_debugger_password deadlock-debugger-password:password
import json_module json
key tidstorage_ip tidstorage:ip key tidstorage_ip tidstorage:ip
key tidstorage_port tidstorage:port key tidstorage_port tidstorage:port
key promise_path erp5-promise:promise-path key promise_path erp5-promise:promise-path
......
...@@ -111,7 +111,7 @@ extra-context = ...@@ -111,7 +111,7 @@ extra-context =
[template-tidstorage] [template-tidstorage]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = 5c52385b4f12fd9719975655bc2eddec md5sum = 520e39f2612a045b42c0ad914bfdc5a9
mode = 640 mode = 640
[template-cloudooo] [template-cloudooo]
...@@ -126,7 +126,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal ...@@ -126,7 +126,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
[template-zope-conf] [template-zope-conf]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/zope.conf.in url = ${:_profile_base_location_}/zope.conf.in
md5sum = ec4203f1f54b05505d8f35cb5799a75c md5sum = 599e004c18fd3461aa846ae75bd112f2
mode = 640 mode = 640
[template] [template]
......
...@@ -80,7 +80,7 @@ products {{ instance_products }} ...@@ -80,7 +80,7 @@ products {{ instance_products }}
container-class Products.TemporaryFolder.TemporaryContainer container-class Products.TemporaryFolder.TemporaryContainer
</zodb_db> </zodb_db>
{% for db_name, mount_point, cache_size, storage_type, storage_dict in json_module.loads(parameter_dict['zodb-list']) -%} {% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%}
<zodb_db {{ db_name }}> <zodb_db {{ db_name }}>
{%- if cache_size %} {%- if cache_size %}
cache-size {{ cache_size }} cache-size {{ cache_size }}
......
...@@ -482,7 +482,7 @@ rtjp-eventlet = 0.3.2 ...@@ -482,7 +482,7 @@ rtjp-eventlet = 0.3.2
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
slapos.core = 0.24 slapos.core = 0.24
slapos.recipe.build = 0.7 slapos.recipe.build = 0.7
slapos.recipe.template = 2.3 slapos.recipe.template = 2.4
slapos.toolbox = 0.23 slapos.toolbox = 0.23
smmap = 0.8.2 smmap = 0.8.2
socketpool = 0.3.0 socketpool = 0.3.0
......
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