slaprunner fix

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 7bfa89b23ba10321e8ec255e801da3f1
+md5sum = 44e8d6060774ccdd49766c4bda1b7926
 
 [template-runner]
 filename = instance-runner.cfg

software/slaprunner/instance.cfg

@@ -81,7 +81,7 @@ context =
 
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2
-template = $${monitor2-template:output}
+template = ${monitor2-template:output}
 rendered = $${buildout:directory}/template-monitor.cfg
 extensions = jinja2.ext.do
 mode = 0644

stack/resilient/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = bceb082deb6b3ee9b015c8b04436b52c
+md5sum = 1dee975a39b006b973df9a2c5a38d76b
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = fe4811540683bfcfac5ac12de084b623
+md5sum = 4716c376caad59c5f16547f66a276f63
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -21,7 +21,7 @@ parts =
   monitor-base
   monitor-check-resilient-feed-file
 
-extends = ${monitor2-template:rendered}
+extends = $${instance-monitor:rendered}
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
@@ -367,3 +367,10 @@ context =
   key monitor_feed_directory monitor-directory:public
   key base_url publish-connection-information:feeds-url
   raw python_executable ${buildout:executable}
+
+[instance-monitor]
+recipe = slapos.recipe.template:jinja2
+template = ${monitor2-template:output}
+rendered = $${buildout:directory}/template-monitor.cfg
+extensions = jinja2.ext.do
+mode = 0644

stack/resilient/pbsready.cfg.in

@@ -20,7 +20,7 @@ parts +=
 
 
 extends =
-  ${monitor2-template:rendered}
+  $${instance-monitor:rendered}
 
 #----------------
 #--
@@ -45,6 +45,7 @@ services = $${rootdirectory:etc}/service
 cache = $${rootdirectory:var}/cache
 notifier = $${rootdirectory:etc}/notifier
 
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 backup = $${basedirectory:backup}/$${slap-parameter:namebase}
@@ -277,3 +278,10 @@ recipe = slapos.cookbook:publish
 ssh-public-key = $${sshkeys-sshd:public-key-value}
 ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
 ip = $${slap-network-information:global-ipv6}
+
+[instance-monitor]
+recipe = slapos.recipe.template:jinja2
+template = ${monitor2-template:output}
+rendered = $${buildout:directory}/template-monitor.cfg
+extensions = jinja2.ext.do
+mode = 0644