Fix up, please rebase before merge me.

software/erp5/software.cfg

 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
-
-[slap-parameter]
-bt5_to_install = erp5_full_text_myisam_catalog
-  erp5_configurator_standard
-  erp5_configurator_maxma_demo
-  erp5_configurator_ung
-  erp5_configurator_run_my_doc
-  erp5_configurator_ebusiness_lotse

software/wendelin/software.cfg

@@ -37,21 +37,19 @@ eggs +=
   ${ipython:egg}
   ${matplotlib:egg}
 
-[slap-parameter]
-bt5_to_install = erp5_full_text_myisam_catalog
-  erp5_configurator_standard
-  erp5_configurator_maxma_demo
-  erp5_configurator_ung
-  erp5_configurator_run_my_doc
-  erp5_configurator_ebusiness_lotse
-  erp5_wendelin_configurator
-
 [erp5_repository_list]
 repository_id_list += wendelin
 
 [local-bt5-repository]
 # we need to override it
 list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${wendelin:location}/bt5/
+bt5_list = erp5_full_text_myisam_catalog
+  erp5_configurator_standard
+  erp5_configurator_maxma_demo
+  erp5_configurator_ung
+  erp5_configurator_run_my_doc
+  erp5_configurator_ebusiness_lotse
+  erp5_wendelin_configurator
 
 [wendelin]
 <= erp5

stack/erp5/buildout.cfg

@@ -199,7 +199,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 0d777bfc8377e5b8ddc2e32a10f45b9b
+md5sum = 38d87bbb2b8193eb588b05ae6b8bbb3d
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -242,6 +242,7 @@ extra-context =
     key librsvg_location librsvg:location
     key libxcb_location libxcb:location
     key local_bt5_repository local-bt5-repository:list
+    key bt5_list local-bt5-repository:bt5-list
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
     key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
@@ -285,13 +286,13 @@ extra-context =
 [template-erp5-single]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
-md5sum = e02554b15718b4c8ef3022e7bc349319
+md5sum = 6dd76b8543347a11ebddcdc16dd98dd9 
 mode = 640
 
 [template-erp5-cluster]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
-md5sum = 3df9664d257096b8097ffae8ec0882f3
+md5sum = 5080559723859b40a390d700431ffedd 
 mode = 640
 
 [template-varnish]
@@ -312,6 +313,13 @@ list = ${local-bt5-repository:list}
 # Same as bt5-repository, but only local repository.
 # Used to generate bt5lists.
 list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap
+bt5_list = erp5_full_text_myisam_catalog
+  erp5_configurator_standard
+  erp5_configurator_maxma_demo
+  erp5_configurator_ung
+  erp5_configurator_run_my_doc
+  erp5_configurator_ebusiness_lotse
+
 
 [genbt5list]
 recipe = plone.recipe.command

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

@@ -84,7 +84,7 @@ kumofs-computer-guid = ${slap-connection:computer-id}
 tidstorage-computer-guid = ${slap-connection:computer-id}
 varnish-computer-guid = ${slap-connection:computer-id}
 cloudooo-json =
-bt5 = {{bt5_to_install}}
+bt5 = {{ bt5_list }}
 bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 

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

@@ -27,7 +27,7 @@ versions = versions
 site-id = erp5
 cloudooo-json =
 promise-path = ${rootdirectory:etc}/erp5promise.cfg
-bt5 = {{bt5_to_install}}
+bt5 = {{ bt5_list }}
 bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 

stack/erp5/instance.cfg.in

@@ -208,6 +208,7 @@ extra-context =
 bin-directory = {{ bin_directory }}
 openssl = {{ openssl_location }}
 local_bt5_repository = {{ local_bt5_repository  }}
+bt5_list = {{ bt5_list }}
 dash = {{ dash_location }}
 curl = {{ curl_location }}
 
@@ -225,9 +226,11 @@ extra-context =
     key dash_location template-erp5-single-parameters:dash
     key template_zope dynamic-template-zope:rendered
     key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
+    key bt5_list template-erp5-single-parameters:bt5_list
 
 [dynamic-template-cluster-parameters]
 local-bt5-repository = {{ local_bt5_repository }}
+bt5_list = {{ bt5_list }}
 
 [dynamic-template-cluster]
 < = jinja2-template-base
@@ -235,6 +238,7 @@ template = {{ template_erp5_cluster }}
 filename = instance-erp5-cluster.cfg
 extra-context =
     key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
+    key bt5_list template-erp5-single-parameters:bt5_list
 # 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}