monitor stack: fix broken tests

software/kvm/common.cfg

@@ -90,7 +90,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = c597309c00b657db92f8c43e733b1763
+md5sum = 3950ee70a0a612d12b67e32854768af6
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -121,14 +121,14 @@ on-update = true
 [template-kvm-resilient-test]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
-md5sum = e3d275621420f0b8c081228caeb571f9
+md5sum = 98defc2880ff21502f7635a184f4b79b
 mode = 0644
 download-only = true
 on-update = true
 
 [template-kvm-import]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/instance-kvm-import.cfg.in
+url = ${:_profile_base_location_}/instance-kvm-import.cfg.jinja2.in
 md5sum = 3177381b65b4b95ba29190a6ac03b771
 mode = 0644
 download-only = true

software/kvm/instance-for-erp5testnode.cfg.in

@@ -13,7 +13,7 @@ nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
 
 kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
-kvm-import = ${template-kvm-import:output}
+kvm-import = $${dynamic-template-kvm-import:rendered}
 kvm-export = $${dynamic-template-kvm-export:rendered}
 
 # Used for the test of resiliency. The system wants a "test" software_type.
@@ -62,6 +62,7 @@ context =
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
     raw template_httpd_cfg ${template-httpd:rendered}
+    raw template_monitor ${monitor2-template:rendered}
     raw template_content ${template-content:location}/${template-content:filename}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
@@ -80,12 +81,29 @@ 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}
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
 import-list = file parts :template-parts-destination
               file replicated :template-replicated-destination
 mode = 0644
 
+[dynamic-template-kvm-import]
+recipe = slapos.recipe.template:jinja2
+template = ${template-kvm-import:location}/instance-kvm-import.cfg.jinja2.in
+rendered = $${buildout:directory}/template-kvm-import.cfg
+extensions = jinja2.ext.do
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
+    raw pbsready_import_template ${pbsready-import:output}
+    raw template_monitor ${monitor2-template:rendered}
+    key slapparameter_dict slap-configuration:configuration
+    raw zcat_binary ${gzip:location}/bin/zcat
+    raw gzip_binary ${gzip:location}/bin/gzip
+mode = 0644
+
 [dynamic-template-kvm-export]
 recipe = slapos.recipe.template:jinja2
 template = ${template-kvm-export:location}/instance-kvm-export.cfg.jinja2

software/kvm/instance-kvm-import.cfg.jinja2.in

+[buildout]
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+# Here, we don't need KVM to run to import data, so we don't
+# even extend the kvm instance profile.
+extends = 
+  {{ pbsready_import_template }}
+{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{{ '  ' ~ template_monitor }}
+
+[resilient-publish-connection-parameter]
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
+
+[monitor-instance-parameter]
+monitor-httpd-port = 8276
+monitor-title = {{ slapparameter_dict.get('name', 'Kvm Resilient clone') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+{%   if slapparameter_dict.get('monitor-username', '') -%}
+username = {{ slapparameter_dict['monitor-username'] }}
+{%   endif -%}
+{%   if slapparameter_dict.get('monitor-password', '') -%}
+password = {{ slapparameter_dict['monitor-password'] }}
+{%   endif -%}
+instance-configuration =
+  raw takeover-url ${resilient-publish-connection-parameter:takeover-url}
+  raw takeover-password ${resilient-publish-connection-parameter:takeover-password}
+{% endif -%}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+var = ${buildout:directory}/var
+log = ${:var}/log
+scripts = ${:etc}/run
+services = ${:etc}/service
+promises = ${:etc}/promise
+novnc-conf = ${:etc}/novnc
+run = ${:var}/run
+ca-dir = ${:srv}/ssl
+cron-entries = ${:etc}/cron.d
+crontabs = ${:etc}/crontabs
+cronstamps = ${:etc}/cronstamps
+
+[importer]
+recipe = slapos.recipe.template:jinja2
+template = {{ template_kvm_import }}
+rendered = ${directory:bin}/${slap-parameter:namebase}-importer
+mode = 0700
+# Resilient stack wants a "wrapper" parameter
+wrapper = ${:rendered}
+context =
+    section directory directory
+    raw zcat_binary {{ zcat_binary }}
+    raw gzip_binary {{ gzip_binary }}
+
+backup-disk-path = ${directory:backup}/virtual.qcow2

software/kvm/instance.cfg.in

@@ -142,7 +142,7 @@ mode = 0644
 
 [dynamic-template-kvm-import]
 recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-import:location}/instance-kvm-import.cfg.in
+template = ${template-kvm-import:location}/instance-kvm-import.cfg.jinja2.in
 rendered = $${buildout:directory}/template-kvm-import.cfg
 extensions = jinja2.ext.do
 context =

stack/monitor/buildout.cfg

@@ -45,6 +45,10 @@ eggs +=
   collective.recipe.template
   cns.recipe.symlink
 
+# XXX - for compatibility
+[monitor-eggs]
+<= eggs
+
 [extra-eggs]
 <= eggs
 interpreter = pythonwitheggs
@@ -86,6 +90,8 @@ filename = httpd-cors.cfg.in
 md5sum = 5afad2bb6e088e080e907f1d837effbb
 # End templates files
 
+[monitor-template]
+rendered = ${monitor2-template:rendered}
 
 [monitor2-template]
 recipe = slapos.recipe.template:jinja2