NEO: fix instanciation with several subpartitions

software/neoppod/instance-neo-admin.cfg.in

+{%- if slapparameter_dict.get('admin') != 0 %}
 {%- set monitor_dict = slapparameter_dict['monitor'] %}
 {%- set bang_on_problem = monitor_dict.pop('bang-on-problem', None) %}
 {%- set periodicity = monitor_dict.pop('periodicity', None) %}
@@ -68,3 +69,4 @@ command-line =
     --key ${directory:etc}/neo.key
 {%- endif %}
 wrapper-path = ${directory:bin}/neoctl
+{%- endif %}

software/neoppod/instance-neo-master.cfg.in

+{%- if slapparameter_dict.get('master') != 0 %}
 [buildout]
 parts +=
   logrotate-master
@@ -27,3 +28,4 @@ masters = {{ dumps(slapparameter_dict['masters']) }}
 name = neo-master
 log = ${neo-master:logfile}
 post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- ${neo-master:binary} -l ${:log}
+{%- endif %}

software/neoppod/software-common.cfg

@@ -116,11 +116,11 @@ md5sum = ccc6e33412259415ec6c3452d37b77cc
 
 [instance-neo-admin]
 <= download-base-neo
-md5sum = 5873b385bed7207ca865536fd63bb610
+md5sum = 87670ddc6b5d2007dac1b6d2ba86d168
 
 [instance-neo-master]
 <= download-base-neo
-md5sum = 728c407bc526252aec2222752226dde6
+md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 <= download-base-neo