kvm: Monitor is not optional for resilient kvm

  This fixes bugs on the order of parts and duplicated sections introduced on:
    8d28b7e0
    d3df3b6e

software/kvm/common.cfg

@@ -92,7 +92,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 3544e25820d1511d153944fc36579986
+md5sum = 733ee7530831229aeee0aeb3460ab2ee 
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -136,7 +136,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-import.cfg.jinja2.in
-md5sum = d5d3b7debf3141913eac926830ea166d
+md5sum = 5e21ad759c148d26134ecefbb4d3d9f1
 mode = 0644
 download-only = true
 on-update = true
@@ -155,7 +155,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
 mode = 644
-md5sum = 13276ead8cf5f9eda28e8dbda35a9bcf
+md5sum = c2ab8a5ff9d8cd351682382ea06b3328 
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-export.cfg.jinja2

-
-{%   set monitor = str(slapparameter_dict.get('enable-monitor', False)).lower() == 'true' -%}
-
 [buildout]
 extends =
   {{ kvm_template }}
@@ -17,10 +14,8 @@ parts +=
   novnc-promise
   cron
   frontend-promise
-{% if monitor -%}
 # monitor parts
   monitor-base
-{% endif %}
 
 # Create the exporter executable, which is a simple shell script
 [exporter]

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

@@ -8,8 +8,6 @@ offline = true
 # even extend the kvm instance profile.
 extends = 
   {{ pbsready_import_template }}
-{% if str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
-{{ '  ' ~ template_monitor }}
 
 [resilient-publish-connection-parameter]
 monitor-base-url = ${publish:monitor-base-url}
@@ -30,7 +28,6 @@ password = {{ slapparameter_dict['monitor-password'] }}
 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

software/kvm/instance.cfg.in

@@ -154,7 +154,6 @@ context =
     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