Slaprunner: Add slapos boot and bang on supervisor

This MR is a complement of nexedi/slapos.core!214, however it can be merged before the release of slapos.core because it won't be used until slapos.toolbox (actuall runner code) is changed to call them.

/cc @jerome @tomo @Nicolas

See merge request !751

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 8d85d8d80f1ae3ff13946d14d0d8fe72
+md5sum = b03f39d483cb7f3554fb40092b5b89fa
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -50,7 +50,7 @@ md5sum = 525e37ea8b2acf6209869999b15071a6
 
 [template-slapos-cfg]
 filename = template/slapos.cfg.in
-md5sum = 95de0677e78fc06cc8304cc6caea9169
+md5sum = fa90fc9a9010ce4bb1478ae37da9c56d
 
 [template-slapformat-definition.cfg]
 filename = template/slapformat-definition.cfg.in
@@ -66,7 +66,7 @@ md5sum = 7645048216fcf957f7773534cd0408dc
 
 [template-supervisord]
 filename = template/supervisord.conf.in
-md5sum = 37f053d75752e998fc3bb9e4bf29d776
+md5sum = 5e6c84098440c6bc163898dcafca8c9b
 
 [template-listener-slapgrid]
 filename = template/listener_slapgrid.py.in

software/slaprunner/instance-runner.cfg

@@ -791,9 +791,17 @@ slapproxy-startsecs = 1
 slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${:slapos-cfg}
 slapproxy-log = $${directory:log}/slapproxy.log
 slapformat = slapformat
-slapformat-command = $${slaprunner:slapos} node format --cfg $${:slapos-cfg} --verbose --logfile $${:slapformat-log} --now -i $${:slapformat-definition.cfg}
+slapformat-command = $${slaprunner:slapos} node format --cfg $${:slapos-cfg} --verbose --logfile $${:slapformat-log} --now
 slapformat-log = $${directory:log}/slapos-node-format.log
 slapformat-startretries = 0
+slapboot = slapboot
+slapboot-command = $${slaprunner:slapos} node boot --cfg $${:slapos-cfg} --verbose --logfile $${:slapboot-log}
+slapboot-log = $${directory:log}/slapos-node-boot.log
+slapboot-startretries = 0
+slapbang = slapbang
+slapbang-command = $${slaprunner:slapos} node bang --cfg $${:slapos-cfg} --verbose --logfile $${:slapbang-log}
+slapbang-log = $${directory:log}/slapos-node-bang.log
+slapbang-startretries = 0
 socket_name = unix://$${:socket_path}
 socket_path = $${directory:tmp}/supervisord.sock
 startsecs = 0

software/slaprunner/template/slapos.cfg.in

@@ -21,6 +21,7 @@ pidfile_software =  {{slaprunner['pidfile-software']}}
 pidfile_instance =  {{slaprunner['pidfile-instance']}}
 
 [slapformat]
+input_definition_file = {{ slaprunner['slapformat-definition.cfg'] }}
 partition_amount = {{ slaprunner['partition-amount'] }}
 alter_user = false
 alter_network = false

software/slaprunner/template/supervisord.conf.in

@@ -58,6 +58,34 @@ stderr_logfile = {{ supervisord['no_logfile'] }}
 directory = {{ supervisord['directory'] }}
 environment = PATH="{{- supervisord['path'] -}}"
 
+[program:{{- supervisord['slapboot'] -}}]
+command = {{ supervisord['slapboot-command'] }}
+process_name = {{ supervisord['slapboot'] }}
+numprocs = {{ supervisord['numprocs'] }}
+autostart = {{ supervisord['autostart'] }}
+exitcodes = {{ supervisord['exitcodes'] }}
+startretries = {{ supervisord['slapboot-startretries'] }}
+startsecs = {{ supervisord['startsecs'] }}
+autorestart = {{ supervisord['autorestart'] }}
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['no_logfile'] }}
+directory = {{ supervisord['directory'] }}
+environment = PATH="{{- supervisord['path'] -}}"
+
+[program:{{- supervisord['slapbang'] -}}]
+command = {{ supervisord['slapbang-command'] }}
+process_name = {{ supervisord['slapbang'] }}
+numprocs = {{ supervisord['numprocs'] }}
+autostart = {{ supervisord['autostart'] }}
+exitcodes = {{ supervisord['exitcodes'] }}
+startretries = {{ supervisord['slapbang-startretries'] }}
+startsecs = {{ supervisord['startsecs'] }}
+autorestart = {{ supervisord['autorestart'] }}
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['no_logfile'] }}
+directory = {{ supervisord['directory'] }}
+environment = PATH="{{- supervisord['path'] -}}"
+
 [program:{{- supervisord['slapproxy'] -}}]
 command = {{ supervisord['slapproxy-command'] }}
 process_name = {{ supervisord['slapproxy'] }}