erp5: Fix dynamic zope instance home function.

stack/erp5/buildout.cfg

@@ -192,7 +192,7 @@ md5sum = 050fa6ff4eb397c5d4cb41a9f75afb3f
 [template-zope-conf]
 < = download-base
 filename = zope.conf.in
-md5sum = 04b40d4729fec7dd528b53dab47439bf
+md5sum = 0bf51218ecbf2bd319214192448a3ef7
 
 [template-runzope-userhosts-preloaded]
 < = download-base
@@ -296,7 +296,7 @@ extra-context =
 [template-erp5]
 < = download-base
 filename = instance-erp5.cfg.in
-md5sum = 463464456c2ed9d761e8a954de02e9e0
+md5sum = 4c552f915eb6549ce160a9ff5871ae74
 
 [template-zeo]
 < = download-base
@@ -306,7 +306,7 @@ md5sum = 9670cf63099e2c520017a23defff51a4
 [template-zope]
 < = download-base
 filename = instance-zope.cfg.in
-md5sum = ea110d1e180151b8ca6d47e9a98a635f
+md5sum = 7fc9bf46be8fc56c164ef74d96db491c
 link-binary =
   ${aspell:location}/bin/aspell
   ${dmtx-utils:location}/bin/dmtxwrite

stack/erp5/instance-erp5.cfg.in

@@ -127,8 +127,7 @@ name = {{ partition_name }}
 {{ sla(partition_name) }}
 config-name = {{ dumps(custom_name) }}
 config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
-config-my-instance = {{ dumps(zope_parameter_dict.get('instance', False)) }}
-config-my-instance-product = {{ dumps(zope_parameter_dict.get('instance-product', False)) }}
+config-instance = {{ dumps(zope_parameter_dict.get('instance', False)) }}
 config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 4)) }}
 config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
 config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }}

stack/erp5/instance-zope.cfg.in

@@ -46,7 +46,7 @@ ca-crl = ${directory:test-ca-crl}
 recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
-instance = ${:srv}/erp5shared
+instance =  {{slapparameter_dict.get('instance', '${:srv}erp5shared')}}
 instance-constraint = ${:instance}/Constraint
 instance-document = ${:instance}/Document
 instance-etc = ${:instance}/etc

stack/erp5/zope.conf.in

 # Note: Environment is setup in running wrapper script, as zope.conf is read
 # too late for some components.
-%define INSTANCE {{ parameter_dict.get('my-instance', parameter_dict['instance']) }}
+%define INSTANCE {{ parameter_dict['instance'] }}
 instancehome $INSTANCE
 zserver-threads {{ parameter_dict['thread-amount'] }}
 # When ownership checking is enabled, the roles a script runs as are the
@@ -20,7 +20,7 @@ rest-input-encoding utf-8
 rest-output-encoding utf-8
 
 # XXX: isn't this entry implicit ?
-products {{ parameter_dict.get('my-instance-products' ,parameter_dict['instance-products']) }}
+products {{ parameter_dict['instance-products'] }}
 
 {% if parameter_dict['webdav'] -%}
 <webdav-source-server>