specify slapos.core version in instance-erp5-*.cfg.in and instance-zope.cfg.in.

otherwise buggy slapos.core-1.0 will be used if exists.

stack/erp5/buildout.cfg

@@ -161,6 +161,7 @@ context =
     key bin_directory buildout:bin-directory
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
+    key slapos_core_version versions:slapos.core
     ${:extra-context}
 
 [template-mariadb]
@@ -183,7 +184,7 @@ extra-context =
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = 69556ddc9773fb95896b7762e998bb9b
+md5sum = 23baedc096a3ee046d2efe2195e19b96
 mode = 640
 
 [template-kumofs]
@@ -220,7 +221,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = a1a5a9983207e4a8128bab331cbd3cd5
+md5sum = 4504529abf707c4a5cd6ccacc761ec71
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -290,13 +291,13 @@ extra-context =
 [template-erp5-single]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
-md5sum = 2a4312202a3160f874c4fa3ee9155a1d
+md5sum = becf4faf3df849bb90ddf5f587f02d5e
 mode = 640
 
 [template-erp5-cluster]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
-md5sum = eecde68b9a266d8883042540ac077839
+md5sum = f4c9cdbbac82232b84db080461bd0007
 mode = 640
 
 [template-varnish]

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

@@ -13,6 +13,7 @@ parts =
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
+versions = versions
 
 [request-common]
 recipe = slapos.cookbook:request
@@ -106,3 +107,6 @@ smtp-url = smtp://localhost:25/
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc/run
 {% endif %}
+
+[versions]
+slapos.core = {{ slapos_core_version }}

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

@@ -20,6 +20,7 @@ parts +=
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
+versions = versions
 
 [slap-parameter]
 # default site id
@@ -135,3 +136,6 @@ path = ${basedirectory:promises}/erp5site
 url = http://${zope-instance:ip}:${zope-instance:port}/${slap-parameter:site-id}
 dash_path = {{ dash_location }}/bin/dash
 curl_path = {{ curl_location }}/bin/curl
+
+[versions]
+slapos.core = {{ slapos_core_version }}

stack/erp5/instance-zope.cfg.in

@@ -18,6 +18,7 @@ parts =
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
+versions = versions
 
 {% if 'frontend-software-url' in slapparameter_dict -%}
 [request-slave-frontend]
@@ -307,3 +308,5 @@ path = ${basedirectory:promises}/apache-backend
 hostname = ${apache-zope-backend-instance:ip}
 port = ${apache-zope-backend-instance:port}
 
+[versions]
+slapos.core = {{ slapos_core_version }}

stack/erp5/instance.cfg.in

@@ -23,6 +23,7 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key slap_software_type slap-parameters:slap-software-type
     key slapparameter_dict slap-parameters:configuration
+    raw slapos_core_version {{ slapos_core_version }}
     ${:extra-context}
 
 [dynamic-template-tidstorage-parameters]

[Vincent Pelletier]

Dangerous use of raw, use key or section.