kvm: fix monitor parameter definition on resilient-kvm

software/kvm/common.cfg

@@ -107,7 +107,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 1ba26b796f1bc509889c8a34296b1b19
+md5sum = d9745bc9bd1d22a640a628c005f88ffb
 download-only = true
 on-update = true
 
@@ -143,7 +143,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
 mode = 644
-md5sum = c2ab8a5ff9d8cd351682382ea06b3328
+md5sum = 13387d37bbf430f1d2b827c8f1acc804
 download-only = true
 on-update = true
 

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

@@ -226,16 +226,10 @@ mode = {{ mode }}
 {{ writefile('cluster-data-content', '${directory:webroot}/${hash-code:passwd}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
 {% endif -%}
 
-[monitor-htpasswd]
-recipe = slapos.cookbook:generate.password
-storage-path = ${directory:etc}/.monitor_user
-bytes = 8
-username = admin
-
 [monitor-instance-parameter]
 monitor-httpd-port = 8060
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-username = ${monitor-instance-parameter:username}
+username = admin
 password = ${monitor-htpasswd:passwd}
 
 [monitor-conf-parameters]

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

@@ -35,3 +35,16 @@ context =
 [publish-connection-information]
 <= resilient-publish-connection-parameter
 
+{% if str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
+[monitor-instance-parameter]
+monitor-httpd-port = 8026
+monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
+{%   if slapparameter_dict.get('monitor-username', '') -%}
+username = {{ slapparameter_dict['monitor-username'] }}
+{%   endif -%}
+{%   if slapparameter_dict.get('monitor-password', '') -%}
+password = {{ slapparameter_dict['monitor-password'] }}
+{%   endif -%}
+
+{% endif -%}