slaprunner: use slapos command instead of slapgrid

software/slaprunner/common.cfg

@@ -44,7 +44,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 569fc375fdf28c2ca8d40be9d6a4814c
+md5sum = 61b4b0d386a6f893b26b1c508ac1d87e
 mode = 0644
 
 [instance-runner-import]
@@ -103,7 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [slapos-cfg-template]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = d215214357d68b63641818a39f9460b6
+md5sum = 12cefe7c6265b983216bb6617aaf55dd
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true

software/slaprunner/instance-runner.cfg

@@ -137,11 +137,11 @@ bytes = 8
 
 [slaprunner]
 slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
+slapos = ${buildout:directory}/bin/slapos
 slapproxy = ${buildout:directory}/bin/slapproxy
 supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
 git-binary = ${git:location}/bin/git
+root_check = false
 slapos.cfg = $${directory:etc}/slapos.cfg
 working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}

software/slaprunner/template/slapos.cfg.in

@@ -4,13 +4,13 @@ instance_root = {{ slaprunner['instance_root'] }}
 master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
 computer_id = slaprunner
 maximal_delay = 0
+root_check = {{ slaprunner['root_check'] }}
 
 [slapformat]
 partition_amount = {{ slaprunner['partition-amount'] }}
 
 [slaprunner]
-slapgrid_sr = {{ slaprunner['slapgrid_sr'] }}
-slapgrid_cp = {{ slaprunner['slapgrid_cp'] }}
+slapos = {{ slaprunner['slapos'] }}
 slapproxy = {{ slaprunner['slapproxy'] }}
 supervisor = {{ slaprunner['supervisor'] }}
 supervisord_config = {{ slaprunner['supervisord_config'] }}