Update powerdns SR to include to render montiro on instance side

software/kvm/common.cfg

@@ -89,7 +89,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = f40a938400e789361c95d5a9246bf0ef 
+md5sum = e5e140808f0f9f360e1afd38277edd65
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

software/kvm/instance.cfg.in

@@ -68,7 +68,7 @@ extra-context =
   raw logrotate_cfg ${template-logrotate-base:rendered}
   raw template_content ${template-content:location}/${template-content:filename}
   raw template_httpd_cfg ${template-httpd:rendered}
-  raw template_monitor ${monitor2-template:rendered}
+  raw template_monitor ${instance-monitor:rendered}
 
 [dynamic-template-kvm]
 recipe = slapos.recipe.template:jinja2
@@ -101,7 +101,7 @@ context =
     raw template_content ${template-content:location}/${template-content:filename}
     raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
     raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
-    raw template_monitor ${monitor2-template:rendered}
+    raw template_monitor ${instance-monitor:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
@@ -119,7 +119,7 @@ context =
     key eggs_directory buildout:eggs-directory
     key slapparameter_dict slap-configuration:configuration
     raw curl_executable_location ${curl:location}/bin/curl
-    raw template_monitor ${monitor2-template:rendered}
+    raw template_monitor ${instance-monitor:rendered}
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
@@ -157,3 +157,9 @@ context =
     raw gzip_binary ${gzip:location}/bin/gzip
 mode = 0644
 
+[instance-monitor]
+recipe = slapos.recipe.template:jinja2
+template = ${monitor2-template:output}
+rendered = ${buildout:directory}/template-monitor.cfg
+extensions = jinja2.ext.do
+mode = 0644

software/powerdns/instance-powerdns.cfg

@@ -143,7 +143,7 @@ parts =
 {{ '  %s' % part }}
 {% endfor %}
 
-extends = ${monitor-template:output}
+extends = {{template_monitor}}
 
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}

software/powerdns/instance.cfg

@@ -43,7 +43,14 @@ extensions = jinja2.ext.do
 extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type RootSoftwareInstance-default
-    raw template_monitor ${monitor2-template:rendered}
+    raw template_monitor $${instance-monitor:rendered}
+
+[instance-monitor]
+recipe = slapos.recipe.template:jinja2
+template = $${monitor2-template:output}
+rendered = ${buildout:directory}/template-monitor.cfg
+extensions = jinja2.ext.do
+mode = 0644
 
 [slap-parameters]
 recipe = slapos.cookbook:slapconfiguration

software/powerdns/software.cfg

@@ -18,14 +18,14 @@ eggs =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = da8be58db4255c07750f7a7583eab3ca
+md5sum = 8498018989045fb35335ea9cb85320a5
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-powerdns]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-powerdns.cfg
-md5sum = 7710007c0bd1817e3c1485ea9ece1e23
+md5sum = 705e963e6a7fb50bb66617d42f1dde37
 output = ${buildout:directory}/template-powerdns.cfg
 mode = 0644
 

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 73c7bd7dec7f874e8423d0ff4eba9427
+md5sum = 91f902e039b5e47a28566e4a027a806b
 
 [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/erp5/buildout.cfg

@@ -301,7 +301,7 @@ context =
     key template_kumofs template-kumofs:target
     key template_mariadb template-mariadb:target
     key template_mariadb_initial_setup template-mariadb-initial-setup:target
-    key template_monitor monitor2-template:output
+    key template_monitor monitor2-template:rendered
     key template_my_cnf template-my-cnf:target
     key template_postfix template-postfix:target
     key template_postfix_aliases template-postfix-aliases:target

stack/monitor/buildout.cfg

@@ -92,8 +92,8 @@ md5sum = bab457ac4d139ed31d0b343a7d14d996
 
 # XXX keep compatibility (with software/ipython_notebook/software.cfg )
 [monitor-template]
-rendered = ${monitor2-template:rendered}
-output = ${monitor2-template:rendered}
+rendered = ${monitor2-template:output}
+output = ${monitor2-template:output}
 
 [monitor2-template]
 recipe = slapos.recipe.template