slaprunner: follow conventions for templates in part directory

software/slaprunner/common.cfg

@@ -28,7 +28,7 @@ parts =
   instance-runner-import
   instance-runner-export
   slapos-cookbook
-  slapos-cfg-template
+  template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
   collective.recipe.template-egg
@@ -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 = 1b4dcbf34da9c781714f27e8336ba340
+md5sum = 9878115a2969489b57e8563ef3d4d6d3
 mode = 0644
 
 [template-runner-import-script]
@@ -116,7 +116,7 @@ filename = launcher.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[slapos-cfg-template]
+[template-slapos-cfg]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
 md5sum = 847df63cf5a226ed338d7ca34b0220b5

software/slaprunner/development.cfg

@@ -21,7 +21,7 @@ parts =
   instance-runner-import
   instance-runner-export
   slapos-cookbook
-  slapos-cfg-template
+  template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
   collective.recipe.template-egg

software/slaprunner/instance-runner.cfg

@@ -498,7 +498,7 @@ port = $${slap-parameter:monitor-port}
 
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
+template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
 rendered = $${slaprunner:slapos.cfg}
 mode = 700
 context =
@@ -506,7 +506,7 @@ context =
 
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
+template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
 rendered = $${test-runner:slapos.cfg}
 mode = 700
 context =