Post Merge fix: Add missing changes

software/slapos-master/instance-erp5.cfg.in

@@ -280,6 +280,3 @@ parts =
   apache-certificate-authority
   fix-ca-folder
   publish
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-{% endif %}

software/slapos-master/instance-zope.cfg.in

-{% if slap_software_type == software_type -%}
 {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 {% set next_port = slapparameter_dict['port-base'] -%}
 {% set site_id = slapparameter_dict['site-id'] -%}
@@ -6,7 +5,7 @@
 {% set node_id_base = slapparameter_dict['name'] -%}
 {% set part_list = [] -%}
 {% set publish_list = [] -%}
-{% set zodb_dict = slapparameter_dict['zodb-dict'] -%}
+{% set zodb_dict = slapparameter_dict.get('zodb-dict', {}) -%}
 {% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%}
 {% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
@@ -226,11 +225,13 @@ bt5-repository =
 [zope-conf-parameter-base]
 ip = {{ ipv4 }}
 site-id = {{ site_id }}
-{% set zodb_list = [] -%}
+{% set zodb_list = slapparameter_dict.get('zodb-extern', []) -%}
 {% for key, (mount_point, cache_size, storage_dict) in zodb_dict.items() -%}
-{%   do zodb_list.append([key, mount_point, cache_size, storage_type, storage_dict]) -%}
+{%   do zodb_list.append({'name': key, 'mount-point': mount_point, 'storage-type': storage_type, 'storage-dict': storage_dict}) -%}
+{%   if cache_size >= 0 -%}
+{%     do zodb_list[-1].__setitem__('cache-size', cache_size) -%}
+{%   endif -%}
 {% endfor -%}
-zodb-list = {{ dumps(zodb_list) }}
 developer-list = {{ dumps(slapparameter_dict['developer-list']) }}
 instance = ${directory:instance}
 instance-products = ${directory:instance-products}
@@ -278,6 +279,18 @@ port = {{ port }}
 event-log = ${directory:log}/{{ name }}-event.log
 z2-log = ${directory:log}/{{ name }}-Z2.log
 node-id = {{ dumps(node_id_base ~ '-' ~ index) }}
+{% set log_list = [] -%}
+{% set import_set = {} -%}
+{% for zodb in zodb_list -%}
+{%   if zodb.setdefault('storage-type', 'NEOStorage') == 'NEOStorage' -%}
+{%     do import_set.__setitem__('neo.client', None) -%}
+{%     set log = buildout_directory ~ '/var/log/' ~ name ~ '-neo-' ~ zodb.get('name', 'main') ~ '.log' -%}
+{%     do log_list.append(log) -%}
+{%     do zodb.setdefault('storage-dict', {}).__setitem__('logfile', log) -%}
+{%   endif -%}
+{% endfor -%}
+import-list = {{ dumps(import_set.keys()) }}
+zodb-list = {{ dumps(zodb_list) }}
 
 [{{ conf_name }}]
 < = zope-conf-base
@@ -325,8 +338,8 @@ path = ${directory:promises}/{{ zope_tunnel_base_name }}
 [{{ section('logrotate-entry-' ~ name) }}]
 < = logrotate-entry-base
 name = {{ name }}
-log = {{ '${' ~ conf_parameter_name ~ ':event-log}' }} {{ '${' ~ conf_parameter_name ~ ':z2-log}' }} {{ '${' ~ name ~ ':longrequest-logger-file}' }}
-post = {{ bin_directory }}/killpidfromfile {{ '${' ~ conf_parameter_name ~ ':pid-file}' }} SIGUSR2
+log = {{ '${' ~ conf_parameter_name ~ ':event-log}' }} {{ '${' ~ conf_parameter_name ~ ':z2-log}' }} {{ '${' ~ name ~ ':longrequest-logger-file}' }} {{ ' '.join(log_list) }}
+post = {{ bin_directory }}/slapos-kill --pidfile {{ '${' ~ conf_parameter_name ~ ':pid-file}' }} -s USR2
 {% endmacro -%}
 
 {% for i in range(slapparameter_dict['instance-count']) -%}
@@ -366,10 +379,7 @@ certificate-authority-path = {{ dumps(slapparameter_dict['ca-path']) }}
 {% endif -%}
 
 [buildout]
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-extends =
-  {{ parameter_dict['instance-logrotate-cfg'] }}
+extends = {{ logrotate_cfg }}
 parts +=
   erp5-promise
   {{ part_list | join('\n  ') }}
@@ -378,4 +388,3 @@ versions = versions
 
 [versions]
 slapos.core = {{ slapos_core_version }}
-{% endif %}

software/slapos-master/software.cfg

@@ -35,10 +35,7 @@ branch = master
 git-executable = ${git:location}/bin/git
 
 [slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
-branch = slapos-master-cluster
-git-executable = ${git:location}/bin/git
+branch = erp5-cluster
 
 [vifib-fix-products-paths]
 recipe = plone.recipe.command
@@ -62,6 +59,11 @@ dummy +=
   
 extra-paths +=
   ${vifib:location}/master
+  
+[download-base-part]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+mode = 644
 
 [template-erp5]
 < = download-base-part
@@ -79,9 +81,13 @@ filename = instance-zope.cfg.in
 #md5sum =
 
 [template-apache-conf]
+< = download-base-part
+filename = apache.conf.in
 md5sum = bb329fc28bef095a01efc901d2f84149
 
 [template-create-erp5-site-real]
+< = download-base-part
+filename = instance-create-erp5-site-real.cfg.in
 md5sum = 61824aab2172d21f1d6403a35cab47cd
 
 

stack/erp5/instance.cfg.in

@@ -73,19 +73,8 @@ extra-context =
     key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
     import urlparse urlparse
     key openssl_location :openssl-location
-# Must match the key id in [switch-softwaretype] which uses this section.
-    key software_type :software-type
-software-type = default
 openssl-location = {{ openssl_location }}
 
-[dynamic-template-erp5-RootSoftwareInstance]
-< = dynamic-template-erp5
-software-type = RootSoftwareInstance
-
-[dynamic-template-erp5-create-erp5-site]
-< = dynamic-template-erp5
-software-type = create-erp5-site
-
 [dynamic-template-balancer-parameters]
 apache = {{ apache_location }}
 openssl = {{ openssl_location }}