Make ERP5 SR able to deploy an ERP5 cluster.

slapos/recipe/generic_mysql/mysql.py

@@ -50,8 +50,9 @@ def updateMysql(args):
     with open(script_filename) as script_file:
       conf['mysql_script'] = script_file.read()
   while True:
-    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root']
+    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--user=root']
     if 'socket' in conf:
+      mysql_upgrade_list.insert(1, '--no-defaults')
       mysql_upgrade_list.append('--socket=' + conf['socket'])
     mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     result = mysql_upgrade.communicate()[0]
@@ -64,8 +65,9 @@ def updateMysql(args):
         print "MySQL database upgraded with result:\n%s" % result
       else:
         print "No need to upgrade MySQL database"
-      mysql_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root']
+      mysql_list = [conf['mysql_binary'].strip(), '-B', '--user=root']
       if 'socket' in conf:
+        mysql_list.insert(1, '--no-defaults')
         mysql_list.append('--socket=' + conf['socket'])
       mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

stack/erp5/buildout.cfg

@@ -55,7 +55,6 @@ extends =
   ../../component/w3m/buildout.cfg
   ../../component/xorg/buildout.cfg
   ../../component/poppler/buildout.cfg
-  ../../component/xtrabackup/buildout.cfg
   ../../component/zabbix/buildout.cfg
   ../../component/sed/buildout.cfg
   ../../component/coreutils/buildout.cfg
@@ -64,6 +63,7 @@ extends =
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
   ../../component/cloudooo/buildout.cfg
+  ../../component/6tunnel/buildout.cfg
 
 parts =
   rdiff-backup
@@ -137,6 +137,11 @@ parts =
 # Create instance template
   template
 
+[download-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+mode = 640
+
 # Local development
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
@@ -177,63 +182,46 @@ context =
     ${:extra-context}
 
 [template-mariadb]
-< = template-jinja2-base
-filename = instance-mariadb.cfg
-md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a
-extra-context =
-    key coreutils_location coreutils:location
-    key dcron_location dcron:location
-    key gettext_location gettext:location
-    key grep_location grep:location
-    key gzip_location gzip:location
-    key logrotate_location logrotate:location
-    key mariadb_location mariadb:location
-    key perl_location perl:location
-    key perl_siteprefix perl:siteprefix
-    key sed_location sed:location
-    key xtrabackup_location xtrabackup:location
+< = download-base
+filename = instance-mariadb.cfg.in
+md5sum = 1d202667c98a5bcc448eb5f61cbbf1e3
 
 [template-zope]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = 918b972679d5c06082363d41483324a7
-mode = 640
+< = download-base
+filename = instance-zope.cfg.in
+md5sum = 3afef75e73fa584d2921780ff3a29669
 
 [template-kumofs]
-< = template-jinja2-base
-filename = instance-kumofs.cfg
-md5sum = 90a321be12ee977800d590bf941021ef
-extra-context =
-    key dash_location dash:location
-    key dcron_location dcron:location
-    key gzip_location gzip:location
-    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 = bd5872108f812c6823a8915670e51c4c
-mode = 640
+< = download-base
+filename = instance-kumofs.cfg.in
+md5sum = 75aae1e3d6836dab1af2f7c00690869e
 
 [template-cloudooo]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = 53492e520be57f4c6a9eacd107c8d446
-mode = 640
+< = download-base
+filename = instance-cloudoo.cfg.in
+md5sum = 24fc2dccc7ec20ec317ac4a9530ce6ac
 
 [template-zope-conf]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/zope.conf.in
-md5sum = bc2154161a1d5baddc4ed4dfaaf94fbe
-mode = 640
+< = download-base
+filename = zope.conf.in
+md5sum = c4c42d06c63d33de703fc03415e34d84
+
+[template-my-cnf]
+< = download-base
+filename = my.cnf.in
+md5sum = 336b837ad86fe24f6242bd008cbce871
+
+[template-mariadb-initial-setup]
+< = download-base
+filename = mariadb_initial_setup.sql.in
+md5sum = 564006953b7d7a12d40a14b6648b32f0
 
 [template]
 < = template-jinja2-base
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 2576de300d1a74fd1a99388af9723d42
+md5sum = 199a90feaa8d07178dc74bb572f54df3
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -248,12 +236,14 @@ extra-context =
     key fontconfig_location fontconfig:location
     key fonts_location fonts:location
     key freetype_location freetype:location
+    key gettext_location gettext:location
     key git_location git:location
     key graphviz_location graphviz:location
     key grep_location grep:location
     key gzip_location gzip:location
     key haproxy_location haproxy:location
     key imagemagick_location imagemagick:location
+    key kumo_location kumo:location
     key libICE_location libICE:location
     key libSM_location libSM:location
     key libX11_location libX11:location
@@ -269,52 +259,69 @@ extra-context =
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
     key openssl_location openssl:location
+    key perl_location perl:location
+    key perl_siteprefix perl:siteprefix
     key poppler_location poppler:location
     key sed_location sed:location
+    key template_balancer template-balancer:target
     key template_cloudooo template-cloudooo:target
+    key template_cluster_zope template-cluster-zope:target
     key template_erp5_single template-erp5-single:target
     key template_erp5_cluster template-erp5-cluster:target
-    key template_kumofs template-kumofs:rendered
-    key template_mariadb template-mariadb:rendered
-    key template_memcached template-memcached:rendered
-    key template_tidstorage template-tidstorage:target
+    key template_kumofs template-kumofs:target
+    key template_logrotate_base template-logrotate-base:rendered
+    key template_mariadb template-mariadb:target
+    key template_mariadb_initial_setup template-mariadb-initial-setup:target
+    key template_my_cnf template-my-cnf:target
     key template_varnish template-varnish:target
+    key template_zeo template-zeo:target
     key template_zope template-zope:target
     key template_zope_conf template-zope-conf:target
     key tesseract_location tesseract:location
+    key sixtunnel_location 6tunnel:location
     key varnish_location varnish-3.0:location
     key w3m_location w3m:location
     key wget_location wget:location
     key zlib_location zlib:location
 
-[template-memcached]
+[template-erp5-single]
+< = download-base
+filename = instance-erp5-single.cfg.in
+md5sum = d35e94974cd4cb8838e205a96f5ec0ba
+
+[template-erp5-cluster]
+< = download-base
+filename = instance-erp5-cluster.cfg.in
+md5sum = d4d95f1749e1d9d3701565f934fcd4dc
+
+[template-zeo]
+< = download-base
+filename = instance-zeo.cfg.in
+md5sum = 9d49e6787600a416545a8ff228abb720
+
+[template-cluster-zope]
+< = download-base
+filename = instance-cluster-zope.cfg.in
+md5sum = 019f306860857e8536f26aba32101b30
+
+[template-balancer]
+< = download-base
+filename = instance-balancer.cfg.in
+md5sum = 787fa10c0dc4e607706c572ba8e06386
+
+[template-logrotate-base]
 < = template-jinja2-base
-filename = instance-memcached.cfg
-md5sum = 2de1801236eb78651ecfd50ada46dd3b
+filename = instance-logrotate-base.cfg
+md5sum = af19ff0c7817df85987c69738fb083f2
 extra-context =
-    key dash_location dash:location
     key dcron_location dcron:location
     key gzip_location gzip:location
-    key kumo_location kumo:location
     key logrotate_location logrotate:location
 
-[template-erp5-single]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
-md5sum = 2a4312202a3160f874c4fa3ee9155a1d
-mode = 640
-
-[template-erp5-cluster]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
-md5sum = eecde68b9a266d8883042540ac077839
-mode = 640
-
 [template-varnish]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-varnish.cfg.in
-md5sum = 17aee2df57b121343b1fd65f4b51ce80
-mode = 640
+< = download-base
+filename = instance-varnish.cfg.in
+md5sum = f7c47ffc3e23e07f81eb4ca172286ccc
 
 [bt5-repository]
 # Format:

stack/erp5/instance-balancer.cfg.in

+{% if software_type == slap_software_type -%}
+{% set part_list = [] -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
+{#
+XXX: This template only supports exactly one IPv4 and (if ipv6 is used) one IPv6
+per partition. No more (undefined result), no less (IndexError).
+-#}
+# TODO: insert varnish between apache & haproxy.
+# And think of a way to specify which urls goe through varnish, which go
+# directly to haproxy. (maybe just passing literal configuration file chunk)
+{% set ipv4 = (ipv4_set | list)[0] -%}
+
+{% if use_ipv6 -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+[zope-tunnel-base]
+recipe = slapos.cookbook:ipv4toipv6
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+
+{% endif -%}
+{% set haproxy_dict = {} -%}
+{% set apache_dict = {} -%}
+{% set next_port = 9000 -%}
+{% for family_name, parameter_id_list in slapparameter_dict['zope-family-dict'].items() -%}
+{%   set zope_family_address_list = [] -%}
+{%   for parameter_id in parameter_id_list -%}
+{%     set zope_address_list = slapparameter_dict[parameter_id] -%}
+{%     for zope_address in zope_address_list -%}
+{%       if use_ipv6 -%}
+[{{ section('zope-tunnel-' ~ next_port) }}]
+< = zope-tunnel-base
+base-name = {{ 'zeo-tunnel-' ~ next_port }}
+ipv4-port = {{ next_port }}
+ipv6-port = {{ zope_address.split(']:')[1] }}
+ipv6 = {{ zope_address.split(']:')[0][1:] }}
+{%         set zope_effective_address = ipv4 ~ ":" ~ next_port -%}
+{%         set next_port = next_port + 1 -%}
+{%       else -%}
+{%         set zope_effective_address = zope_address -%}
+{%       endif -%}
+{%       do zope_family_address_list.append(zope_effective_address) -%}
+{%     endfor -%}
+{%   endfor -%}
+{%   set haproxy_port = next_port -%}
+{%   set next_port = next_port + 1 -%}
+{%   do haproxy_dict.__setitem__(family_name, (haproxy_port, zope_family_address_list)) -%}
+{%   do apache_dict.__setitem__(family_name, (next_port, 'http://' ~ ipv4 ~ ':' ~ haproxy_port)) -%}
+{%   set next_port = next_port + 1 -%}
+{% endfor -%}
+
+[haproxy]
+recipe = slapos.cookbook:haproxy
+conf-path = ${directory:etc}/haproxy.cfg
+ip = {{ ipv4 }}
+maxconn = {{ slapparameter_dict['haproxy-maxconn'] }}
+server-check-path = {{ slapparameter_dict['haproxy-server-check-path'] }}
+wrapper-path = ${directory:services}/haproxy
+binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
+backend-dict = {{ dumps(haproxy_dict) }}
+
+[apache]
+recipe = slapos.cookbook:apache.zope.backend
+backend-list = {{ dumps(apache_dict.values()) }}
+ip = {% if use_ipv6 %}{{ ipv6 }}{% else %}{{ ipv4 }}{% endif %}
+wrapper = ${directory:bin}/apache
+scheme = https
+key-file = ${directory:apache-conf}/apache.key
+cert-file = ${directory:apache-conf}/apache.crt
+configuration-file = ${directory:apache-conf}/apache.conf
+access-control-string = {{ slapparameter_dict['apache-access-control-string'] }}
+pid-file = ${directory:run}/apache.pid
+lock-file = ${directory:run}/apache.lock
+ssl-session-cache = $${directory:log}/apache-ssl-session-cache
+error-log = ${directory:log}/apache-error.log
+access-log = ${directory:log}/apache-access.log
+apache-binary = {{ parameter_dict['apache'] }}/bin/httpd
+ssl-authentication = {{ slapparameter_dict['apache-ssl-authentication'] }}
+backend-path = {{ slapparameter_dict['apache-backend-path'] }}
+# Note: Without certificate-authority main certificate have to be hardcoded
+ssl-authentication-certificate = ${certificate-authority:ca-dir}/cacert.pem
+ssl-authentication-crl = ${certificate-authority:ca-crl}
+
+[publish]
+recipe = slapos.cookbook:publish.serialised
+{% for family_name, (apache_port, _) in apache_dict.items() -%}
+{%   if use_ipv6 -%}
+{{     family_name }} = ${apache:scheme}://[${apache:ip}]:{{ apache_port }}
+{%   else -%}
+{{     family_name }} = ${apache:scheme}://${apache:ip}:{{ apache_port }}
+{%   endif -%}
+{% endfor -%}
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${directory:requests}
+wrapper = ${directory:services}/ca
+ca-private = ${directory:private}
+ca-certs = ${directory:certs}
+ca-newcerts = ${directory:newcerts}
+ca-crl = ${directory:crl}
+{% set ca = slapparameter_dict['ca'] -%}
+country-code = {{ ca.get('country-code', 'ZZ') }}
+email = {{ ca.get('email', 'nobody@example.com') }}
+state = {{ ca.get('state', 'Dummy State') }}
+city = {{ ca.get('city', 'Dummy City') }}
+company = {{ ca.get('company', 'Dummy Company') }}
+
+[ca-apache]
+< = certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = ${apache:key-file}
+cert-file = ${apache:cert-file}
+executable = ${apache:wrapper}
+wrapper = ${directory:services}/apache
+
+[logrotate-apache]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+name = apache
+log = ${apache:error-log} ${apache:access-log}
+post = {{ parameter_dict['bin-directory'] }}/killpidfromfile ${apache:pid-file} SIGUSR1
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+apache-conf = ${:etc}/apache
+bin = ${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+var = ${buildout:directory}/var
+run = ${:var}/run
+log = ${:var}/log
+ca-dir = ${buildout:directory}/srv/ssl
+requests = ${:ca-dir}/requests
+private = ${:ca-dir}/private
+certs = ${:ca-dir}/certs
+newcerts = ${:ca-dir}/newcerts
+crl = ${:ca-dir}/crl
+
+[buildout]
+extends = {{ parameter_dict['instance-logrotate-cfg'] }}
+parts +=
+  publish
+  logrotate-apache
+  haproxy
+  ca-apache
+  {{ part_list | join('\n  ') }}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+{% endif %}

stack/erp5/instance-cloudoo.cfg.in

 {% if software_type == slap_software_type -%}
 {% set json = json_module.loads(parameter_dict.get('cloudooo-json', '{}')) -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
 parts =
   publish-cloudooo-connection-information
   cloudooo-instance
   promise
   promise-openoffice
+{% if use_ipv6 -%}
+  promise-tunnel
+{% endif -%}
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-cloudooo-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
+{% else -%}
 url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+{% endif -%}
 
 [cloudooo-instance]
 recipe = slapos.cookbook:generic.cloudooo
@@ -61,6 +69,25 @@ path = ${directory:promise}/openoffice
 hostname = ${cloudooo-instance:ip}
 port = ${cloudooo-instance:openoffice-port}
 
+{% if use_ipv6 -%}
+[promise-tunnel]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/tunnel
+hostname = ${ipv6toipv4:ipv6}
+port = ${ipv6toipv4:ipv6-port}
+
+[ipv6toipv4]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:service}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = ${cloudooo-instance:ip}
+ipv6 = {{ (ipv6_set | list)[0] }}
+ipv6-port = ${cloudooo-instance:port}
+ipv4-port = ${cloudooo-instance:port}
+base-name = cloudooo-tunnel
+
+{% endif -%}
 # rest of parts are candidates for some generic stuff
 [directory]
 recipe = slapos.cookbook:mkdirectory

stack/erp5/instance-erp5-single.cfg.in

@@ -87,7 +87,7 @@ bt5 = ${slap-parameter:bt5}
 bt5-repository-url = ${slap-parameter:bt5-repository-url}
 
 [request-common]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = ${slap-connection:software-release-url}
 sla = computer_guid
 sla-computer_guid = ${slap-connection:computer-id}
@@ -101,7 +101,17 @@ partition-id = ${slap-connection:partition-id}
 [request-mariadb]
 <=request-common
 name = MariaDB DataBase
+config = test-database-amount mariadb-binlogs database-list innodb-buffer-size innodb-log-file-size innodb-log-buffer-size mariadb-relaxed-writes
 software-type = mariadb
+{% set config_list = ('mariadb-binlogs', 'database-list', 'innodb-buffer-size', 'innodb-log-file-size', 'innodb-log-buffer-size', 'mariadb-relaxed-writes') -%}
+config = database-amount {{ config_list | join(' ') }}
+# BBB: 100 is too much, but kept for backward compatibility.
+config-test-database-amount = {{ dumps(slapparameter_dict.get('test-database-amount', 100)) }}
+{% for option in config_list -%}
+{%   if option in slapparameter_dict -%}
+config-{{ option }} = {{ dumps(slapparameter_dict[option]) }}
+{%   endif -%}
+{% endfor -%}
 
 [request-cloudooo]
 <=request-common
@@ -112,8 +122,10 @@ software-type = cloudooo
 
 [request-memcached]
 <=request-common
-name = Memcached
-software-type = memcached
+name = KumoFS-ram
+software-type = kumofs
+config = ram-storage-size
+config-ram-storage-size = 64m
 
 [request-kumofs]
 <=request-common

stack/erp5/instance-kumofs.cfg.in

+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
 parts =
   publish-kumofs-connection-information
@@ -16,37 +18,52 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-kumofs-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
+{% else -%}
 url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
+{% endif -%}
 
 [kumofs-instance]
 recipe = slapos.cookbook:generic.kumofs
 
 # Network options
+{% if use_ipv6 -%}
+ip = ${slap-network-information:global-ipv6}
+address-family = inet6
+{% else -%}
 ip = ${slap-network-information:local-ipv4}
+address-family = inet4
+{% endif -%}
 manager-port = 13101
 server-port = 13201
 server-listen-port = 13202
 gateway-port = 13301
+# Paths: Data
+{% set ram_storage_size = slapparameter_dict.get('ram-storage-size') -%}
+{% if ram_storage_size -%}
+data-path = *#capsiz=${:storage-size}
+storage-size = {{ ram_storage_size }}
+{% else -%}
+data-directory = ${directory:kumofs-data}
+{% endif -%}
 
 # Paths: Running wrappers
 gateway-wrapper = ${basedirectory:services}/kumofs_gateway
 manager-wrapper = ${basedirectory:services}/kumofs_manager
 server-wrapper = ${basedirectory:services}/kumofs_server
 
-# Paths: Data
-data-directory = ${directory:kumofs-data}
-
 # Paths: Logs
 kumo-gateway-log = ${basedirectory:log}/kumo-gateway.log
 kumo-manager-log = ${basedirectory:log}/kumo-manager.log
 kumo-server-log = ${basedirectory:log}/kumo-server.log
 
 # Binary information
-kumo-gateway-binary = {{ kumo_location }}/bin/kumo-gateway
-kumo-manager-binary = {{ kumo_location }}/bin/kumo-manager
-kumo-server-binary = {{ kumo_location }}/bin/kumo-server
-shell-path = {{ dash_location }}/bin/dash
+kumo-gateway-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-gateway
+kumo-manager-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-manager
+kumo-server-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-server
+shell-path = {{ parameter_dict['dash-location'] }}/bin/dash
 
 [logrotate-entry-kumofs]
 <= logrotate
@@ -60,9 +77,9 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
-logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
-gzip-binary = {{ gzip_location }}/bin/gzip
-gunzip-binary = {{ gzip_location }}/bin/gunzip
+logrotate-binary = {{ parameter_dict['logrotate-location'] }}/usr/sbin/logrotate
+gzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gzip
+gunzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gunzip
 # Directories
 wrapper = ${rootdirectory:bin}/logrotate
 conf = ${rootdirectory:etc}/logrotate.conf
@@ -96,7 +113,7 @@ bin = ${buildout:directory}/bin
 
 [cron]
 recipe = slapos.cookbook:cron
-dcrond-binary = {{ dcron_location }}/sbin/crond
+dcrond-binary = {{ parameter_dict['dcron-location'] }}/sbin/crond
 cron-entries = ${directory:cron-entries}
 crontabs = ${directory:crontabs}
 cronstamps = ${directory:cronstamps}
@@ -140,3 +157,4 @@ port = ${kumofs-instance:gateway-port}
 <= promise-template
 path = ${basedirectory:promise}/kumofs-manager
 port = ${kumofs-instance:manager-port}
+{% endif %}

stack/erp5/instance-logrotate-base.cfg.in

+[buildout]
+parts =
+  cron-entry-logrotate
+
+[cron]
+recipe = slapos.cookbook:cron
+cron-entries = ${logrotate-directory:cron-entries}
+dcrond-binary = {{ dcron_location }}/sbin/crond
+crontabs = ${logrotate-directory:crontabs}
+cronstamps = ${logrotate-directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${logrotate-directory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${logrotate-directory:bin}/cron_simplelogger
+log = ${logrotate-directory:log}/cron.log
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+logrotate-entries = ${logrotate-directory:logrotate-entries}
+backup = ${logrotate-directory:logrotate-backup}
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+wrapper = ${logrotate-directory:bin}/logrotate
+conf = ${logrotate-directory:etc}/logrotate.conf
+state-file = ${logrotate-directory:srv}/logrotate.status
+
+[cron-entry-logrotate]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[logrotate-directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${:etc}/cron.d
+cronstamps = ${:etc}/cronstamps
+crontabs = ${:etc}/crontabs
+logrotate-backup = ${:backup}/logrotate
+logrotate-entries = ${:etc}/logrotate.d
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+backup = ${:srv}/backup
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+log = ${buildout:directory}/var/log
+

stack/erp5/instance-memcached.cfg.in

-# memcached-compatible volatile cache using kumofs
-# that has no limitation for key length and data size
-
-[buildout]
-parts =
-  publish-kumofs-connection-information
-  kumofs-instance
-  logrotate
-  logrotate-entry-kumofs
-  cron
-  cron-entry-logrotate
-  promise-kumofs-server
-  promise-kumofs-server-listen
-  promise-kumofs-gateway
-  promise-kumofs-manager
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[publish-kumofs-connection-information]
-recipe = slapos.cookbook:publishurl
-url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
-
-[kumofs-instance]
-recipe = slapos.cookbook:generic.kumofs
-
-# Network options
-ip = ${slap-network-information:local-ipv4}
-manager-port = 13101
-server-port = 13201
-server-listen-port = 13202
-# previous memcached configuration
-gateway-port = 11000
-# previous memcached configuration
-storage-size = 64m
-
-# Paths: Running wrappers
-gateway-wrapper = ${basedirectory:services}/volatile_kumofs_gateway
-manager-wrapper = ${basedirectory:services}/volatile_kumofs_manager
-server-wrapper = ${basedirectory:services}/volatile_kumofs_server
-
-# Paths: Data
-data-path = *#capsiz=${:storage-size}
-
-# Paths: Logs
-kumo-gateway-log = ${basedirectory:log}/kumo-gateway.log
-kumo-manager-log = ${basedirectory:log}/kumo-manager.log
-kumo-server-log = ${basedirectory:log}/kumo-server.log
-
-# Binary information
-kumo-gateway-binary = {{ kumo_location }}/bin/kumo-gateway
-kumo-manager-binary = {{ kumo_location }}/bin/kumo-manager
-kumo-server-binary = {{ kumo_location }}/bin/kumo-server
-shell-path = {{ dash_location }}/bin/dash
-
-[logrotate-entry-kumofs]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = kumofs
-log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
-  ${kumofs-instance:kumo-server-log}
-
-# rest of parts are candidates for some generic stuff
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
-gzip-binary = {{ gzip_location }}/bin/gzip
-gunzip-binary = {{ gzip_location }}/bin/gunzip
-# Directories
-wrapper = ${rootdirectory:bin}/logrotate
-conf = ${rootdirectory:etc}/logrotate.conf
-logrotate-entries = ${directory:logrotate-entries}
-backup = ${directory:logrotate-backup}
-state-file = ${rootdirectory:srv}/logrotate.status
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = ${rootdirectory:var}/log
-services = ${rootdirectory:etc}/run
-promise = ${rootdirectory:etc}/promise
-run = ${rootdirectory:var}/run
-backup = ${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cron-entries = ${rootdirectory:etc}/cron.d
-crontabs = ${rootdirectory:etc}/crontabs
-cronstamps = ${rootdirectory:etc}/cronstamps
-logrotate-backup = ${basedirectory:backup}/logrotate
-logrotate-entries = ${rootdirectory:etc}/logrotate.d
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-var = ${buildout:directory}/var
-srv = ${buildout:directory}/srv
-bin = ${buildout:directory}/bin
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = {{ dcron_location }}/sbin/crond
-cron-entries = ${directory:cron-entries}
-crontabs = ${directory:crontabs}
-cronstamps = ${directory:cronstamps}
-catcher = ${cron-simplelogger:wrapper}
-binary = ${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = ${rootdirectory:bin}/cron_simplelogger
-log = ${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = ${logrotate:wrapper}
-
-# Deploy zope promises scripts
-[promise-template]
-recipe = slapos.cookbook:check_port_listening
-hostname = ${kumofs-instance:ip}
-port = ${kumofs-instance:server-listen-port}
-
-[promise-kumofs-server]
-<= promise-template
-path = ${basedirectory:promise}/kumofs-server
-port = ${kumofs-instance:server-port}
-
-[promise-kumofs-server-listen]
-<= promise-template
-path = ${basedirectory:promise}/kumofs-server-listen
-port = ${kumofs-instance:server-listen-port}
-
-[promise-kumofs-gateway]
-<= promise-template
-path = ${basedirectory:promise}/kumofs-gateway
-port = ${kumofs-instance:gateway-port}
-
-[promise-kumofs-manager]
-<= promise-template
-path = ${basedirectory:promise}/kumofs-manager
-port = ${kumofs-instance:manager-port}

stack/erp5/instance-varnish.cfg.in

@@ -17,7 +17,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-varnish-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
 url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
 
 [varnish-instance]

stack/erp5/instance-zeo.cfg.in

+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
+{% set next_port = 2000 -%}
+{% set part_list = [] -%}
+{% set storage_dict = {} -%}
+{% set zodb_dict = {} -%}
+{% set tidstorage_dict = slapparameter_dict.get('tidstorage-dict') -%}
+{% set known_tid_storage_identifier_dict = {} -%}
+{% set default_zodb_path = buildout_directory ~ '/srv/zodb' -%}
+{% set zodb_backup_path = buildout_directory ~ '/srv/backup/zodb' -%}
+{% set default_tidstorage_timestamp_path = buildout_directory ~ '/srv/backup/tidstorage' -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{#
+XXX: This template only supports exactly one IPv6 per
+partition. No more (undefined result), no less (IndexError).
+-#}
+{% set ipv4 = (ipv4_set | list)[0] -%}
+{% set tidstorage_ip = ipv4 -%}
+{% set tidstorage_port = 6001 -%}
+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+
+[zeo-base]
+recipe = slapos.cookbook:zeo
+log-path = ${directory:log}/${:base-name}.log
+pid-path = ${directory:run}/${:base-name}.pid
+conf-path = ${directory:etc}/${:base-name}.conf
+wrapper-path = ${directory:services}/${:base-name}
+binary-path = {{ bin_directory }}/runzeo
+ip = {{ ipv4 }}
+
+{% if use_ipv6 -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+[ipv6toipv4-base]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+ipv6 = {{ ipv6 }}
+{% endif -%}
+
+{% for export_id, mountpoint_dict in slapparameter_dict['zodb-dict'].items() -%}
+{%   do storage_dict.setdefault(
+       mountpoint_dict.get('storage-family', 'default'), []
+     ).append((
+       export_id,
+       mountpoint_dict.get('mount-point', '/'),
+       mountpoint_dict.get('cache-size', -1),
+       mountpoint_dict.get('storage-dict', {}),
+     )) -%}
+{% endfor -%}
+{% for storage_family, export_list in storage_dict.items() -%}
+{%   set known_tid_storage_identifier_host = (ipv4, local_current_port) -%}
+{%   set client_dict = {} -%}
+{%   for export_id, mount_point, cache_size, storage_dict in export_list -%}
+{%     do storage_dict.__setitem__('path', storage_dict.get('path', '%(zodb)s/' ~ export_id ~ '.fs') % {'zodb': default_zodb_path}) -%}
+{%     do client_dict.update(storage_dict.get('client', {})) -%}
+{%     do client_dict.__setitem__('storage', export_id) -%}
+{#     XXX: I would like to raise if export_id is present in zodb_dict -#}
+{%     do zodb_dict.__setitem__(export_id, [
+         mount_point,
+         cache_size,
+         client_dict,
+       ]) -%}
+{%     if tidstorage_dict != None -%}
+{%       do known_tid_storage_identifier_dict.__setitem__(
+           (known_tid_storage_identifier_host, export_id), (
+             storage_dict['path'],
+             tidstorage_dict.get('zodb-dict', {}).get(export_id, '%(backup)s/' ~ export_id) % {'backup': zodb_backup_path},
+             mount_point,
+           ),
+         ) -%}
+{%     endif -%}
+{%   endfor -%}
+{%   set zeo_section_name = 'zeo-' ~ storage_family %}
+[{{ zeo_section_name }}]
+< = zeo-base
+base-name = zeo-{{ storage_family }}
+port = {{ next_port }}
+{%   set storage_list = [] -%}
+{%   for storage_name, _, _, storage_dict in export_list -%}
+{%     do storage_list.append((storage_name, storage_dict['path'])) -%}
+{%   endfor -%}
+storage = {{ dumps(storage_list) }}
+
+[{{ section(zeo_section_name ~ "-promise") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
+port = {{ next_port }}
+path = ${directory:promises}/zeo-{{ storage_family }}
+
+{%   if use_ipv6 -%}
+{%     do client_dict.__setitem__('server', '[' ~ ipv6 ~ ']:' ~ next_port) -%}
+{%     set tunnel_section_name = zeo_section_name ~ "-tunnel" -%}
+[{{ tunnel_section_name }}]
+< = ipv6toipv4-base
+base-name = zeo-tunnel-{{ storage_family }}
+ipv6-port = {{ next_port }}
+ipv4-port = {{ next_port }}
+
+[{{ section(tunnel_section_name ~ "-promise") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ "${" ~ tunnel_section_name ~ ":ipv6}" }}
+port = {{ next_port }}
+path = ${directory:promises}/zeo-tunnel-{{ storage_family }}
+{%   else -%}
+{%     do client_dict.__setitem__('server', ipv4 ~ ':' ~ next_port) -%}
+{%   endif -%}
+{%   set next_port = next_port + 1 -%}
+{% endfor -%}
+
+{% if tidstorage_dict != None -%}
+[tidstorage]
+recipe = slapos.cookbook:tidstorage
+known-tid-storage-identifier-dict = {{ dumps(known_tid_storage_identifier_dict) }}
+configuration-path = ${directory:etc}/tidstorage.py
+ip = {{ tidstorage_ip }}
+port = {{ tidstorage_port }}
+timestamp-file-path = {{ tidstorage_dict.get('timestamp-path', '%(backup)s/repozo_tidstorage_timestamp.log' % {'backup': default_tidstorage_timestamp_path}) }}
+logfile-name = ${directory:log}/tidstorage.log
+pidfile-name = ${directory:run}/tidstorage.pid
+status-file = ${directory:tidstorage}/tidstorage.tid
+tidstorage-repozo-binary = {{ bin_directory }}/tidstorage_repozo
+tidstoraged-binary = {{ bin_directory }}/tidstoraged
+repozo-binary = {{ bin_directory }}/repozo
+tidstorage-wrapper = ${directory:services}/tidstoraged
+repozo-wrapper = ${buildout:bin-directory}/tidstorage-repozo
+
+[{{ section("promise-tidstorage") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${tidstorage:ip}
+port = ${tidstorage:port}
+path = ${directory:promises}/tidstorage
+
+{%  if use_ipv6 -%}
+[tidstorage-tunnel]
+< = ipv6toipv4-base
+base-name = tidstorage-tunnel
+ipv4-port = ${tidstorage:port}
+ipv6-port = ${tidstorage:port}
+
+[{{ section("promise-tidstorage-tunnel") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${tidstorage-tunnel:ipv6}
+port = ${tidstorage-tunnel:ipv6-port}
+path = ${directory:promises}/tidstorage
+{% endif -%}
+
+[{{ section("cron-entry-tidstorage-backup") }}]
+# TODO:
+# - configurable periodicity
+# - configurable full/incremental
+# - configurable retention
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = tidstorage
+frequency = 0 0 * * *
+command = ${tidstorage:repozo-wrapper}
+
+[{{ section("logrotate-tidstorage") }}]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+name = tidstorage
+log = ${tidstorage:logfile-name}
+post = {{ bin_directory }}/killpidfromfile ${tidstorage:pidfile-name} SIGHUP
+{% else -%}
+[tidstorage]
+ip =
+port =
+
+[tidstorage-tunnel]
+ipv6 =
+ipv6-port =
+{% endif -%}
+
+[publish]
+recipe = slapos.cookbook:publish.serialised
+zodb-storage-type = zeoclient
+zodb-dict = {{ dumps(zodb_dict) }}
+{% if use_ipv6 -%}
+tidstorage-ip = ${tidstorage-tunnel:ipv6}
+tidstorage-port = ${tidstorage-tunnel:ipv6-port}
+{% else -%}
+tidstorage-ip = ${tidstorage:ip}
+tidstorage-port = ${tidstorage:port}
+{% endif -%}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+promises = ${:etc}/promise
+var = ${buildout:directory}/var
+log = ${:var}/log
+run = ${:var}/run
+backup-zodb = {{ zodb_backup_path }}
+zodb = {{ default_zodb_path }}
+tidstorage = {{ default_tidstorage_timestamp_path }}
+
+[buildout]
+extends =
+  {{ parameter_dict['instance-logrotate-cfg'] }}
+parts +=
+  {{ part_list | join('\n  ') }}
+  publish
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+{% endif %}

stack/erp5/instance-zope.cfg.in

@@ -21,7 +21,7 @@ offline = true
 
 {% if 'frontend-software-url' in slapparameter_dict -%}
 [request-slave-frontend]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = {{ slapparameter_dict['frontend-software-url'] }}
 software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }}
 sla = instance_guid
@@ -47,14 +47,14 @@ config-{{ name }} = {{ value }}
 return = site_url
 
 [publish-apache-zope-backend-connection-string]
-recipe = slapos.cookbook:publish
+recipe = slapos.cookbook:publish.serialised
 url = ${request-slave-frontend:connection-site_url}
 login = ${zope-instance:user}
 password = ${zope-instance:password}
 url-deadlock = ${:url}/${zope-instance:deadlock-path}?${zope-instance:deadlock-password}
 {% else %}
 [publish-apache-zope-backend-connection-string]
-recipe = slapos.cookbook:publish
+recipe = slapos.cookbook:publish.serialised
 url = https://${zope-instance:user}:${zope-instance:password}@[${apache-zope-backend-instance:ip}]:${apache-zope-backend-instance:port}
 url-deadlock = ${:url}/${zope-instance:deadlock-path}?${zope-instance:deadlock-password}
 {% endif %}

stack/erp5/instance.cfg.in

@@ -6,8 +6,8 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-[slap-parameters]
-recipe = slapos.cookbook:slapconfiguration
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
 computer = ${slap-connection:computer-id}
 partition = ${slap-connection:partition-id}
 url = ${slap-connection:server-url}
@@ -19,52 +19,15 @@ recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 extra-context =
 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-parameters:slap-software-type
-    key slapparameter_dict slap-parameters:configuration
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    key computer_id slap-configuration:computer
     ${:extra-context}
 
-[dynamic-template-tidstorage-parameters]
-apache = {{ apache_location }}
-haproxy = {{ haproxy_location }}
-dcron = {{ dcron_location }}
-logrotate = {{ logrotate_location }}
-gzip = {{ gzip_location }}
-openssl = {{ openssl_location }}
-coreutils = {{ coreutils_location }}
-git = {{ git_location }}
-graphviz = {{ graphviz_location }}
-grep = {{ grep_location }}
-imagemagick = {{ imagemagick_location }}
-librsvg = {{ librsvg_location }}
-mariadb = {{ mariadb_location }}
-sed = {{ sed_location }}
-tesseract = {{ tesseract_location }}
-w3m = {{ w3m_location }}
-aspell = {{ aspell_location }}
-poppler = {{ poppler_location }}
-dmtx-utils = {{ dmtx_utils_location }}
-buildout-bin-directory = {{ buildout_bin_directory }}
-zope-conf-template = {{ template_zope_conf }}
-
-[dynamic-template-tidstorage]
-< = jinja2-template-base
-template = {{ template_tidstorage }}
-filename = instance-tidstorage.cfg
-extensions = jinja2.ext.do
-extra-context =
-    section parameter_dict dynamic-template-tidstorage-parameters
-    import json_module json
-    raw zope_port_base 12000
-    raw zeo_port_base 15000
-    raw haproxy_port_base 11000
-    raw apache_port_base 10000
-    key ipv4_set slap-parameters:ipv4
-    key ipv6_set slap-parameters:ipv6
-# Must match the key id in [switch-softwaretype] which uses this section.
-    raw software_type tidstorage
-
 [dynamic-template-cloudooo-parameters]
 file = {{ file_location }}
 fontconfig = {{ fontconfig_location }}
@@ -82,6 +45,8 @@ zlib = {{ zlib_location }}
 libreoffice-bin = {{ libreoffice_bin_location }}
 fonts = {{ fonts_location }}
 buildout-bin-directory = {{ buildout_bin_directory }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
 
 [dynamic-template-cloudooo]
 < = jinja2-template-base
@@ -184,37 +149,136 @@ extra-context =
     key template_zope dynamic-template-zope:rendered
     key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
 
-[dynamic-template-cluster-parameters]
+[dynamic-template-cluster-erp5-parameters]
 local-bt5-repository = {{ local_bt5_repository }}
 
-[dynamic-template-cluster]
+[dynamic-template-cluster-erp5]
 < = jinja2-template-base
 template = {{ template_erp5_cluster }}
-filename = instance-erp5-cluster.cfg
+filename = instance-cluster-erp5.cfg
+extensions = jinja2.ext.do
 extra-context =
-    key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
+    key local_bt5_repository dynamic-template-cluster-erp5-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
+    raw software_type cluster
 
-# BBB: use "cluster" software type instead
-[dynamic-template-production]
-< = dynamic-template-cluster
-software-type = production
+[dynamic-template-balancer-parameters]
+apache = {{ apache_location }}
+openssl = {{ openssl_location }}
+haproxy = {{ haproxy_location }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+bin-directory = {{ bin_directory }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-balancer]
+< = jinja2-template-base
+template = {{ template_balancer }}
+extensions = jinja2.ext.do
+filename = instance-balancer.cfg
+extra-context =
+    section parameter_dict dynamic-template-balancer-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type balancer
+
+[dynamic-template-zeo-parameters]
+buildout-bin-directory = {{ buildout_bin_directory }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-zeo]
+< = jinja2-template-base
+template = {{ template_zeo }}
+filename = instance-zeo.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key buildout_directory buildout:directory
+    section parameter_dict dynamic-template-zeo-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type zodb-zeo
+
+[dynamic-template-cluster-zope-parameters]
+zope-conf-template = {{ template_zope_conf }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+git = {{ git_location }}
+graphviz = {{ graphviz_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+coreutils = {{ coreutils_location }}
+grep = {{ grep_location }}
+imagemagick = {{ imagemagick_location }}
+sed = {{ sed_location }}
+tesseract = {{ tesseract_location }}
+w3m = {{ w3m_location }}
+poppler = {{ poppler_location }}
+dmtx-utils = {{ dmtx_utils_location }}
+openssl = {{ openssl_location }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-cluster-zope]
+< = jinja2-template-base
+template = {{ template_cluster_zope }}
+filename = instance-cluster-zope.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key buildout_directory buildout:directory
+    section parameter_dict dynamic-template-cluster-zope-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type cluster-zope
+
+[dynamic-template-kumofs-parameters]
+dash-location = {{ dash_location }}
+dcron-location = {{ dcron_location }}
+gzip-location = {{ gzip_location }}
+kumo-location = {{ kumo_location }}
+logrotate-location = {{ logrotate_location }}
+
+[dynamic-template-kumofs]
+< = jinja2-template-base
+template = {{ template_kumofs }}
+filename = instance-kumofs.cfg
+extra-context =
+    section parameter_dict dynamic-template-kumofs-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type kumofs
+
+[dynamic-template-mariadb-parameters]
+coreutils-location = {{ coreutils_location }}
+dcron-location = {{ dcron_location }}
+gettext-location = {{ gettext_location }}
+grep-location = {{ grep_location }}
+gzip-location = {{ gzip_location }}
+logrotate-location = {{ logrotate_location }}
+mariadb-location = {{ mariadb_location }}
+perl-location = {{ perl_location }}
+perl-siteprefix = {{ perl_siteprefix }}
+sed-location = {{ sed_location }}
+template-my-cnf = {{ template_my_cnf }}
+template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}
+
+[dynamic-template-mariadb]
+< = jinja2-template-base
+template = {{ template_mariadb }}
+filename = instance-mariadb.cfg
+extensions = jinja2.ext.do
+extra-context =
+    section parameter_dict dynamic-template-mariadb-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type mariadb
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-single:rendered}
-production = ${dynamic-template-production:rendered}
-cluster = ${dynamic-template-cluster:rendered}
-kumofs = {{ template_kumofs }}
-memcached = {{ template_memcached }}
+cluster = ${dynamic-template-cluster-erp5:rendered}
+kumofs = ${dynamic-template-kumofs:rendered}
 cloudooo = ${dynamic-template-cloudooo:rendered}
 zope = ${dynamic-template-zope:rendered}
-mariadb = {{ template_mariadb }}
-tidstorage = ${dynamic-template-tidstorage:rendered}
+mariadb = ${dynamic-template-mariadb:rendered}
 varnish = ${dynamic-template-varnish:rendered}
+balancer = ${dynamic-template-balancer:rendered}
+zodb-zeo = ${dynamic-template-zeo:rendered}
+cluster-zope = ${dynamic-template-cluster-zope:rendered}
 
 [slap-connection]
 # part to migrate to new - separated words

stack/erp5/mariadb_initial_setup.sql.in

+USE mysql;
+DROP FUNCTION IF EXISTS last_insert_grn_id;
+{% set mroonga = parameter_dict.get('mroonga', 'ha_mroonga.so') -%}
+{% if mroonga %}CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME '{{ mroonga }}';{% endif %}
+DROP FUNCTION IF EXISTS sphinx_snippets;
+#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';
+
+{% macro database(name, user, password) -%}
+CREATE DATABASE IF NOT EXISTS {{ name }};
+GRANT ALL PRIVILEGES ON {{ name }}.* TO {{ user }}@'%' IDENTIFIED BY '{{ password }}';
+GRANT ALL PRIVILEGES ON {{ name }}.* TO {{ user }}@'localhost' IDENTIFIED BY '{{ password }}';
+{% endmacro -%}
+
+{% for entry in parameter_dict['database-list'] -%}
+{{   database(entry['name'], entry['user'], entry['password']) }}
+{% endfor -%}

stack/erp5/my.cnf.in

+{% set socket = parameter_dict['socket'] -%}
+# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
+# The MySQL server
+[mysqld]
+# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
+# different engine, like MyISAM. Such behaviour generates problems only, when
+# tables requested as InnoDB are silently created with MyISAM engine.
+#
+# Loud fail is really required in such case.
+sql-mode="NO_ENGINE_SUBSTITUTION"
+
+# Workaround for https://bugs.launchpad.net/maria/+bug/985828
+# that causes wrong result in Resource_zGetInventoryList etc.
+optimizer_switch = derived_merge=off
+
+skip-show-database
+{% set ip = parameter_dict.get('ip') -%}
+{% if ip -%}
+bind-address = {{ ip }}
+port = {{ parameter_dict['port'] }}
+{% else -%}
+skip-networking
+{% endif -%}
+socket = {{ socket }}
+datadir = {{ parameter_dict['data-directory'] }}
+pid-file = {{ parameter_dict['pid-file'] }}
+log-error = {{ parameter_dict['error-log'] }}
+slow_query_log
+slow_query_log_file = {{ parameter_dict['slow-query-log'] }}
+long_query_time = 1
+max_allowed_packet = 128M
+query_cache_size = 32M
+
+plugin-load = ha_mroonga.so;handlersocket.so
+
+# By default only 100 connections are allowed, when using zeo
+# we may have much more connections
+max_connections = 1000
+
+{% set innodb_buffer_size = parameter_dict.get('innodb-buffer-size') -%}
+{% if innodb_buffer_size %}innodb_buffer_size = {{ innodb_buffer_size }}{% endif %}
+{% set innodb_log_file_size = parameter_dict.get('innodb-log-file-size') -%}
+{% if innodb_log_file_size %} innodb_log_file_size = {{ innodb_log_file_size }}{% endif %}
+{% set innodb_log_buffer_size = parameter_dict.get('innodb-log-buffer-size') -%}
+{% if innodb_log_buffer_size %} innodb_log_buffer_size = {{ innodb_log_buffer_size }}{% endif %}
+
+# very important to allow parallel indexing
+# Note: this is compatible with binlog-based incremental backups, because ERP5
+# doesn't use "insert ... select" (in any number of queries) pattern.
+innodb_locks_unsafe_for_binlog = 1
+
+{% set log_bin = parameter_dict.get('binlog-path') -%}
+{% if log_bin -%}
+log-bin = {{ log_bin }}
+{% set binlog_expire_days = parameter_dict.get('binlog-expire-days') -%}
+{% if binlog_expire_days > 0 %}expire_logs_days = {{ binlog_expire_days }}{% endif %}
+{% endif -%}
+
+{# Note: strictly check equality to one, as a last line of defense against users not reading the doc. -#}
+{% if parameter_dict.get('relaxed_writes') == 1 -%}
+innodb_flush_log_at_trx_commit = 0
+innodb_flush_method = nosync
+innodb_doublewrite = 0
+sync_frm = 0
+{% endif -%}
+
+# Force utf8 usage
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+skip-character-set-client-handshake
+
+[client]
+socket = {{ socket }}
+
+[mysql]
+no-auto-rehash
+
+[mysqlhotcopy]
+interactive-timeout

stack/erp5/zope.conf.in

@@ -43,7 +43,7 @@ products {{ instance_products }}
 </product-config>
 
 {% endif -%}
-{% set timerserver_interval = parameter_dict.get('timerserver-interval', '0') | int -%}
+{% set timerserver_interval = parameter_dict.get('timerserver-interval', 0) -%}
 {% if timerserver_interval -%}
 %import timerserver
 <timer-server>
@@ -83,7 +83,7 @@ products {{ instance_products }}
 
 {% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%}
 <zodb_db {{ db_name }}>
-{%-   if cache_size %}
+{%-   if cache_size >= 0 %}
   cache-size {{ cache_size }}
 {%-   endif %}
   mount-point {{ mount_point }}