slaprunner: Move definition inside slapos.cfg

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

software/slaprunner/instance-runner.cfg

@@ -791,7 +791,7 @@ 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
 socket_name = unix://$${:socket_path}

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