kvm-resilient: fix remove option to disable monitor

software/kvm/common.cfg

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

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

@@ -34,17 +34,17 @@ context =
 # Extends publish section with resilient parameters
 [publish-connection-information]
 <= resilient-publish-connection-parameter
+monitor-base-url = ${monitor-publish:monitor-base-url}
+monitor-setup-url = ${monitor-publish:monitor-setup-url}
 
-{% 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', '') -%}
+{% if slapparameter_dict.get('monitor-username', '') -%}
 username = {{ slapparameter_dict['monitor-username'] }}
-{%   endif -%}
-{%   if slapparameter_dict.get('monitor-password', '') -%}
+{% endif -%}
+{% if slapparameter_dict.get('monitor-password', '') -%}
 password = {{ slapparameter_dict['monitor-password'] }}
-{%   endif -%}
-
 {% endif -%}
+