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

slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file

parent 2365bbe9
......@@ -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 = c66f18b74b958805bb2196fb1c54683e
md5sum = 89d3e017ace46f2f86f2abd962e2db5a
mode = 0644
[instance-runner-import]
......@@ -103,7 +103,11 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
<<<<<<< HEAD
md5sum = d31d1c51a51bc4b2b8dda197777a4bcb
=======
md5sum = 65dc3a88476b8e0366dbd40493ad4bc9
>>>>>>> 3f080e7... slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in
download-only = true
......
......@@ -490,6 +490,7 @@ context =
key instance_monitoring_url slaprunner:instance-monitor-url
key ipv4 slaprunner:ipv4
key ipv6 slaprunner:ipv6
raw knowledge0_file $${buildout:directory}/$${private:filename}
key log_dir slaprunner:log_dir
key partition_amount slaprunner:partition-amount
key private_key slaprunner:private_key
......
......@@ -29,6 +29,7 @@ debug = {{ debug }}
auto_deploy = {{ auto_deploy }}
auto_deploy_instance = {{ auto_deploy_instance }}
autorun = {{ autorun }}
knowledge0_cfg = {{ knowledge0_file }}
[slapproxy]
host = {{ proxy_host }}
......
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