From fd0f8bdc707c3ed3bfb49e66ed56778c787024e1 Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant <nicolas.wavrant@tiolive.com> Date: Mon, 18 Aug 2014 04:13:46 +0100 Subject: [PATCH] slaprunner: all template parts follow naming convention --- software/slaprunner/common.cfg | 4 ++-- software/slaprunner/instance-runner.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 15825846f..b4c627394 100644 --- a/software/slaprunner/common.cfg +++ b/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 = 58d0f26daf27e15caf7324217f05877f +md5sum = ad0b8047c5f5887e431ab7ed8e953b66 mode = 0644 [template-runner-import-script] @@ -125,7 +125,7 @@ filename = slapos.cfg.in download-only = true mode = 0644 -[parameters-template] +[template-parameters] recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/${:filename} md5sum = f8446fcf254b4929eb828a9a1d7e5f62 diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 885ee6952..176403cfc 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -571,7 +571,7 @@ command = $${prepare-software:wrapper-path} [instance-parameters] recipe = slapos.recipe.template:jinja2 extensions = jinja2.ext.do -template = ${parameters-template:location}/${parameters-template:filename} +template = ${template-parameters:location}/${template-parameters:filename} rendered = $${directory:etc}/.parameter.xml.default mode = 0644 context = -- 2.30.9