slaprunner: slapos.cfg path included in slapos.cfg

98f6d562 · Nicolas Wavrant · Cédric Le Ninivin · 44f190ac · 98f6d562 · 98f6d562
Commit 98f6d562 authored Mar 15, 2014 by Nicolas Wavrant Committed by Cédric Le Ninivin Apr 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

software/slaprunner/common.cfg software/slaprunner/common.cfg +1 -1

software/slaprunner/template/slapos.cfg.in software/slaprunner/template/slapos.cfg.in +1 -0

No files found.
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -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 = 12cefe7c6265b983216bb6617aaf55dd
+md5sum = 788795524769f6d946526ac282508b69
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true

--- a/software/slaprunner/template/slapos.cfg.in
+++ b/software/slaprunner/template/slapos.cfg.in
@@ -11,6 +11,7 @@ partition_amount = {{ slaprunner['partition-amount'] }}

 [slaprunner]
 slapos = {{ slaprunner['slapos'] }}
+slapos_cfg = {{ slaprunner['slapos.cfg'] }}
 slapproxy = {{ slaprunner['slapproxy'] }}
 supervisor = {{ slaprunner['supervisor'] }}
 supervisord_config = {{ slaprunner['supervisord_config'] }}