Commit ce06afb9 authored by Nicolas Wavrant's avatar Nicolas Wavrant Committed by Cédric Le Ninivin

slaprunner: use slapos command instead of slapgrid

parent a0ee5770
...@@ -44,7 +44,7 @@ mode = 0644 ...@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = 569fc375fdf28c2ca8d40be9d6a4814c md5sum = 61b4b0d386a6f893b26b1c508ac1d87e
mode = 0644 mode = 0644
[instance-runner-import] [instance-runner-import]
...@@ -103,7 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -103,7 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template] [slapos-cfg-template]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = d215214357d68b63641818a39f9460b6 md5sum = 12cefe7c6265b983216bb6617aaf55dd
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in filename = slapos.cfg.in
download-only = true download-only = true
......
...@@ -137,11 +137,11 @@ bytes = 8 ...@@ -137,11 +137,11 @@ bytes = 8
[slaprunner] [slaprunner]
slaprunner = ${buildout:directory}/bin/slaprunner slaprunner = ${buildout:directory}/bin/slaprunner
slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr slapos = ${buildout:directory}/bin/slapos
slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
slapproxy = ${buildout:directory}/bin/slapproxy slapproxy = ${buildout:directory}/bin/slapproxy
supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
git-binary = ${git:location}/bin/git git-binary = ${git:location}/bin/git
root_check = false
slapos.cfg = $${directory:etc}/slapos.cfg slapos.cfg = $${directory:etc}/slapos.cfg
working-directory = $${runnerdirectory:home} working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project} project-directory = $${runnerdirectory:project}
......
...@@ -4,13 +4,13 @@ instance_root = {{ slaprunner['instance_root'] }} ...@@ -4,13 +4,13 @@ instance_root = {{ slaprunner['instance_root'] }}
master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }} master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
computer_id = slaprunner computer_id = slaprunner
maximal_delay = 0 maximal_delay = 0
root_check = {{ slaprunner['root_check'] }}
[slapformat] [slapformat]
partition_amount = {{ slaprunner['partition-amount'] }} partition_amount = {{ slaprunner['partition-amount'] }}
[slaprunner] [slaprunner]
slapgrid_sr = {{ slaprunner['slapgrid_sr'] }} slapos = {{ slaprunner['slapos'] }}
slapgrid_cp = {{ slaprunner['slapgrid_cp'] }}
slapproxy = {{ slaprunner['slapproxy'] }} slapproxy = {{ slaprunner['slapproxy'] }}
supervisor = {{ slaprunner['supervisor'] }} supervisor = {{ slaprunner['supervisor'] }}
supervisord_config = {{ slaprunner['supervisord_config'] }} supervisord_config = {{ slaprunner['supervisord_config'] }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment