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

software/erp5/instance-erp5-production.cfg.in

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

software/erp5/instance.cfg.in

@@ -181,10 +181,22 @@ extra-context =
     key openssl_location template-erp5-development-parameters:openssl
     key template_zope dynamic-template-zope:rendered
 
+[dynamic-template-production-parameters]
+local-bt5-repository = {{ local_bt5_repository }}
+
+[dynamic-template-production]
+< = jinja2-template-base
+template = {{ template_erp5_production }}
+filename = instance-erp5-production.cfg
+extra-context =
+    key local_bt5_repository dynamic-template-production-parameters:local-bt5-repository
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type production
+
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-development:rendered}
-production = {{ template_erp5_production }}
+production = ${dynamic-template-production:rendered}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}

software/erp5/software.cfg

@@ -134,7 +134,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ee7d9040f3f90948fe15f78196f66149
+md5sum = 9e966770123ab09c018533ad9ac8a742
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -165,6 +165,7 @@ extra-context =
     key libreoffice_bin_location libreoffice-bin:location
     key librsvg_location librsvg:location
     key libxcb_location libxcb:location
+    key local_bt5_repository local-bt5-repository:list
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
     key openssl_location openssl:location
@@ -173,7 +174,7 @@ extra-context =
     key sed_location sed:location
     key template_cloudooo template-cloudooo:target
     key template_erp5_development template-erp5-development:target
-    key template_erp5_production template-erp5-production:rendered
+    key template_erp5_production template-erp5-production:target
     key template_kumofs template-kumofs:rendered
     key template_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
@@ -203,11 +204,10 @@ md5sum = df405a60901b5c112093d276c5bb1998
 mode = 640
 
 [template-erp5-production]
-< = template-jinja2-base
-filename = instance-erp5-production.cfg
-md5sum = 3051f3fea39d7409c417dcac26027b56
-extra-context =
-    key local_bt5_repository local-bt5-repository:list
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-production.cfg.in
+md5sum = 33beda33ae8105b61956fa53f2643303
+mode = 640
 
 [template-varnish]
 recipe = slapos.recipe.build:download