Move instance-erp5-production.cfg.in rendering to slapgrid-cp time.

In preparation for better ERP5 clusterisation.

stack/erp5/buildout.cfg

@@ -238,7 +238,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 700b8729a4d9a8423ab2a99de486cc31
+md5sum = bee6c2b640efee53e3b6e209127cb0bc
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -279,7 +279,7 @@ extra-context =
     key sed_location sed:location
     key template_cloudooo template-cloudooo: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_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
@@ -308,11 +308,10 @@ md5sum = 2a4312202a3160f874c4fa3ee9155a1d
 mode = 640
 
 [template-erp5-cluster]
-< = template-jinja2-base
-filename = instance-erp5-cluster.cfg
-md5sum = b4a9688ca7983fac5dd573e66c6e4263
-extra-context =
-    key local_bt5_repository local-bt5-repository:list
+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

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

+{% if slap_software_type == software_type -%}
 #############################
 #
 # Request erp5 production environnment
@@ -104,3 +105,4 @@ smtp-url = smtp://localhost:25/
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc/run
+{% endif %}

stack/erp5/instance.cfg.in

@@ -187,11 +187,30 @@ extra-context =
     key template_zope dynamic-template-zope:rendered
     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]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-single:rendered}
-production = {{ template_erp5_cluster }}
-cluster = {{ template_erp5_cluster }}
+production = ${dynamic-template-production:rendered}
+cluster = ${dynamic-template-cluster:rendered}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}