software/neoppod: Fix promise with old NEO SR

The NEO promise that was introduced in nexedi/slapos@a3bb9a41
always fails with older NEO versions [1]. In order to not always have a
red monitoring state of our NEO cluster, this patch returns the promise
to the state before NEO specific promise was introduced.

[1] This promise checks NEO cluster state via 'print summary' command [2].
Old NEO doesn't know 'print summary' command. This command was only
introduced with nexedi/neoppod@e434c253.

[2] See nexedi/slapos.toolbox@2d69e8fb

software/neoppod/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = ae00507d9e69209a0babd725cf6be536
 
 [instance-neo-admin]
 filename = instance-neo-admin.cfg.in
-md5sum = b6e1ccb1d90160110202e5111eec2afa
+md5sum = d4ec8f47439c1dce22dae09b6d781ab7
 
 [instance-neo-master]
 filename = instance-neo-master.cfg.in
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = 504b021715566e69ad664101f1b12a5c
+md5sum = 800f58e81fd30813e352a6493b82ea58
 
 [template-neo-my-cnf]
 filename = my.cnf.in

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

@@ -8,32 +8,23 @@
 parts +=
   logrotate-admin
   neoctl
+  neo-admin-promise
 {%- if monitor_passwd != None %}
-  monitor-neo-health
 extends =
   {{ template_monitor }}
 
-[directory]
-plugin =  ${:etc}/plugin
-
-[monitor-neo-health]
-<= monitor-promise-base
-promise = check_neo_health
-name = ${:_buildout_section_name_}.py
-config-neoctl = ${neoctl:wrapper-path}
-{%- if bang_on_problem != None %}
-config-bang-on-problem = {{ dumps(bang_on_problem) }}
-{%- endif %}
-{%- if periodicity != None %}
-config-periodicity = {{ dumps(periodicity) }}
-{%- endif %}
-
 [monitor-instance-parameter]
 monitor-httpd-port = {{ slapparameter_dict.get('monitor-port', 2052) }}
 monitor-title = neo
 password = {{ monitor_passwd }}
 {%- endif %}
 
+[neo-admin-promise]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${neo-admin:ip}
+port = ${neo-admin:port}
+path = ${directory:promises}/neo-admin-promise
+
 [neo-admin]
 recipe = slapos.cookbook:neoppod.admin
 binary = {{bin_directory}}/neoadmin

software/neoppod/instance-neo.cfg.in

@@ -142,6 +142,7 @@ post = {{ bin_directory }}/slapos-kill -s RTMIN+1 -- {{ bin_directory }}/neostor
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
+promises = ${buildout:directory}/etc/promises
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
 var = ${buildout:directory}/var