Replace erp5.update per erp5.promise and erp5.bootstrap

stack/erp5/buildout.cfg

@@ -211,7 +211,7 @@ extra-context =
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = ea09a89ca79290c33de0b59a19a5490f 
+md5sum = bb06b0a957ba8011f5b0f1cb09ac03de
 mode = 640
 
 [template-kumofs]
@@ -283,6 +283,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
@@ -317,7 +318,7 @@ extra-context =
 [template-erp5-development]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
-md5sum = df405a60901b5c112093d276c5bb1998
+md5sum = e95429fa0e4e3bb87b042277ba52fd8f
 mode = 640
 
 [template-erp5-production]

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

@@ -12,8 +12,9 @@ parts +=
   request-memcached
   request-kumofs
   basedirectory
-  erp5-update
   test-runner
+  erp5-bootstrap
+  erp5-promise
 
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -23,6 +24,14 @@ offline = true
 # default site id
 site-id = erp5
 cloudooo-json =
+promise-path = ${rootdirectory:etc}/erp5promise.cfg
+bt5 = erp5_full_text_myisam_catalog
+  erp5_configurator_standard
+  erp5_configurator_maxma_demo
+  erp5_configurator_ung
+  erp5_configurator_run_my_doc
+bt5-repository-url = {{ local_bt5_repository }}
+smtp-url = smtp://localhost:25/
 
 [test-runner]
 recipe = slapos.cookbook:erp5.test
@@ -60,25 +69,21 @@ certs = ${directory:test-ca-dir}/certs
 newcerts = ${directory:test-ca-dir}/newcerts
 crl = ${directory:test-ca-dir}/crl
 
-[erp5-update]
-recipe = slapos.cookbook:erp5.update
-
-# Configuration
-url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/
+[erp5-bootstrap]
+recipe = slapos.cookbook:erp5.bootstrap
+runner-path = ${basedirectory:services}/erp5-bootstrap
 mysql-url =  ${request-mariadb:connection-url}
+zope-url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/${slap-parameter:site-id}
+
+[erp5-promise]
+recipe = slapos.cookbook:erp5.promise
+promise-path = ${slap-parameter:promise-path}
 kumofs-url = ${request-kumofs:connection-url}
 memcached-url = ${request-memcached:connection-url}
 cloudooo-url = ${request-cloudooo:connection-url}
-site-id = ${slap-parameter:site-id}
-openssl-binary = {{ openssl_location }}/bin/openssl
-cadir-path = ${erp5-certificate-authority:ca-dir}
-
-# Paths
-update-wrapper = ${basedirectory:services}/erp5-update
-
-# Defaults
-configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
-bt5-repository-list = ${zope-instance:bt5-repository-list}
+smtp-url = ${slap-parameter:smtp-url}
+bt5 = ${slap-parameter:bt5}
+bt5-repository-url = ${slap-parameter:bt5-repository-url}
 
 [request-common]
 recipe = slapos.cookbook:request
@@ -114,6 +119,10 @@ software-type = memcached
 name = KumoFS
 software-type = kumofs
 
+[zope-instance]
+promise-path = ${slap-parameter:promise-path}
+site-id = ${slap-parameter:site-id}
+
 [directory]
 test-ca-dir = ${rootdirectory:srv}/test-ca
 test-instance-path = ${rootdirectory:srv}/test-instance

stack/erp5/instance.cfg.in

@@ -168,6 +168,7 @@ extra-context =
 [template-erp5-development-parameters]
 bin-directory = {{ bin_directory }}
 openssl = {{ openssl_location }}
+local_bt5_repository = {{ local_bt5_repository  }}
 
 [template-erp5-development]
 < = jinja2-template-base
@@ -180,6 +181,7 @@ extra-context =
     key bin_directory template-erp5-development-parameters:bin-directory
     key openssl_location template-erp5-development-parameters:openssl
     key template_zope dynamic-template-zope:rendered
+    key local_bt5_repository template-erp5-development-parameters:local_bt5_repository
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype