fixup! scalability: add erp5_location (dev) key

stack/erp5/buildout.cfg

@@ -206,6 +206,8 @@ rendered = ${buildout:directory}/${:filename}
 extra-context =
 context =
     key bin_directory buildout:bin-directory
+    key erp5_location erp5:location
+    key erp5_dev_location erp5.dev-repository:location
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
     ${:extra-context}
@@ -250,7 +252,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 14fa86c4b817f0286d629c6aef4a00e5
+md5sum = fb27129d1d5d0cbbf2d355fb3bd2c204
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -260,8 +262,6 @@ extra-context =
     key dash_location dash:location
     key dcron_location dcron:location
     key dmtx_utils_location dmtx-utils:location
-    key erp5_location erp5:location
-    key erp5_dev_location erp5.dev-repository:location
     key file_location file:location
     key findutils_location findutils:location
     key fontconfig_location fontconfig:location
@@ -330,7 +330,7 @@ md5sum = 19f6f1309bbefa651300a1802cab3fa0
 [template-scalability]
 < = download-base
 filename = instance-scalability.cfg.in
-md5sum = f39df18c864afb0a2c5fb4799c169928
+md5sum = 09c3693bca3b685cbf840df3fe21f22b
 
 [template-zeo]
 < = download-base

stack/erp5/instance-scalability.cfg.in

@@ -56,7 +56,6 @@ recipe = slapos.cookbook:wrapper
 log-path = ${basedirectory:log}
 binary-path = {{ bin_directory }}/runScalabilityTestSuite
 wrapper-path = ${rootdirectory:bin}/runScalabilityTestSuite
-erp5-location = {{ erp5_location }}
 output = ${binary-wrap-launcher:binary-path}
 site-id = "/{{ site_id }}"
 # Suppose that there is a user zope family in the configuration
@@ -88,6 +87,7 @@ test-suite = {{ slapparameter_dict.get('test-suite') }}
 test-suite-master-url = {{ slapparameter_dict.get('test-suite-master-url') }}
 log-path = ${binary-wrap-launcher:log-path}
 runner-path = ${binary-wrap-performance-tester:wrapper-path}
+erp5-location = {{ erp5_location }}
 
 # Create partition's directories
 [basedirectory]

stack/erp5/instance.cfg.in

@@ -163,20 +163,6 @@ extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type cluster
 
-[dynamic-template-scalability-parameters]
-erp5 = {{ erp5_location }}
-erp5_dev = {{ erp5_dev_location }}
-
-[dynamic-template-scalability]
-< = jinja2-template-base
-template = {{ template_scalability }}
-filename = instance-scalability.cfg
-extensions = jinja2.ext.do
-extra-context =
-    key erp5_location ${dynamic-template-scalability-parameters:erp5_dev}
-    key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
-# Must match the key id in [switch-softwaretype] which uses this section.
-    raw software_type scalability
 
 [dynamic-template-balancer-parameters]
 apache = {{ apache_location }}
@@ -245,6 +231,10 @@ extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type cluster-zope
 
+[dynamic-template-scalability-parameters]
+erp5 = {{ erp5_location }}
+erp5_dev = {{ erp5_dev_location }}
+
 [dynamic-template-scalability]
 < = jinja2-template-base
 template = {{ template_scalability }}
@@ -255,6 +245,7 @@ extra-context =
     key bin_directory dynamic-template-scalability:bin_directory
     key curl_location template-erp5-single-parameters:curl
     key dash_location template-erp5-single-parameters:dash
+    key erp5_location dynamic-template-scalability-parameters:erp5_dev
     key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
     key template_zope dynamic-template-zope:rendered
     key template_cluster_zope dynamic-template-cluster-zope:rendered