Commit 605bc253 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner : fix

rename of the template slapos.cfg.in to respect the standards
parent c855c54d
...@@ -88,7 +88,7 @@ mode = 0644 ...@@ -88,7 +88,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 output = ${buildout:directory}/template-runner.cfg
md5sum = 8c1f4f58fa8c030317a9a914d0ab63f5 md5sum = 1355283f0e79a890aeb687cedd8220ee
mode = 0644 mode = 0644
[instance-runner-import] [instance-runner-import]
...@@ -139,7 +139,7 @@ recipe = hexagonit.recipe.download ...@@ -139,7 +139,7 @@ recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = 28ceadbeaa3b687f7ba39d87cd6772f3 md5sum = 28ceadbeaa3b687f7ba39d87cd6772f3
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in.j2 filename = slapos.cfg.in
download-only = true download-only = true
mode = 0644 mode = 0644
......
[slapos]
software_root = {{ software_root }}
instance_root = {{instance_root }}
master_url = http://{{ ipv4 }}:{{ proxy_port }}
computer_id = slaprunner
maximal_delay = 0
[slapformat]
partition_amount = {{ partition_amount }}
[slaprunner]
slapgrid_sr = {{ slapgrid_sr }}
slapgrid_cp = {{ slapgrid_cp }}
slapproxy = {{ slapproxy }}
supervisor = {{ supervisor }}
supervisord_config = {{ supervisord_config }}
runner_workdir = {{ runner_workdir }}
runner_host = {{ ipv4 }}
runner_port = {{ runner_port }}
ipv4_address = {{ ipv4 }}
ipv6_address = {{ ipv6 }}
etc_dir = {{ etc_dir }}
run_dir = {{ run_dir }}
log_dir = {{ log_dir }}
default_repo = {{ default_repo }}
default_sr = {{ default_sr }}
auto_deploy = {{ auto_deploy }}
[slapproxy]
host = {{ proxy_host }}
port = {{ proxy_port }}
database_uri = {{ proxy_database }}
[sshkeys_authority]
ssh_client = {{ ssh_client }}
public_key = {{ public_key }}
private_key = {{ private_key }}
[gitclient]
git = {{ git }}
[cloud9_IDE]
cloud9 = {{ cloud9_url }}
[slapos]
software_root = {{software_root}}
instance_root = {{instance_root}}
master_url = http://{{ipv4}}:{{proxy_port}}
computer_id = slaprunner
maximal_delay = 0
[slapformat]
partition_amount = {{partition_amount}}
[slaprunner]
slapgrid_sr = {{slapgrid_sr}}
slapgrid_cp = {{slapgrid_cp}}
slapproxy = {{slapproxy}}
supervisor = {{supervisor}}
supervisord_config = {{supervisord_config}}
runner_workdir = {{runner_workdir}}
runner_host = {{ipv4}}
runner_port = {{runner_port}}
ipv4_address = {{ipv4}}
ipv6_address = {{ipv6}}
etc_dir = {{etc_dir}}
run_dir = {{run_dir}}
log_dir = {{log_dir}}
default_repo = {{default_repo}}
default_sr = {{default_sr}}
auto_deploy = {{auto_deploy}}
[slapproxy]
host = {{proxy_host}}
port = {{proxy_port}}
database_uri = {{proxy_database}}
[sshkeys_authority]
ssh_client = {{ssh_client}}
public_key = {{public_key}}
private_key = {{private_key}}
[gitclient]
git = {{git}}
[cloud9_IDE]
cloud9 = {{cloud9_url}}
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