kvm-resilient: fix missing connection parameter

software/kvm/common.cfg

@@ -119,7 +119,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = e7c613f15fec8b440180d3c26476ed18
+md5sum = c420aae56ecd64c94814647b74d9a4fb
 download-only = true
 on-update = true
 

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

@@ -7,7 +7,7 @@
 {% set monitor_dict = {} -%}
 
 {% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
-{% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
+{% set monitor_return = ['monitor-base-url'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
 {% endif -%}
@@ -67,12 +67,7 @@ backend-url = ${request-kvm:connection-backend-url}
 url = ${request-kvm:connection-url}
 ipv6 = ${request-kvm:connection-ip}
 monitor-base-url = ${publish:monitor-base-url}
-monitor-url = ${publish:monitor-url}
-monitor-user = ${publish:monitor-user}
-monitor-password = ${publish:monitor-password}
-{% if monitor_interface_url -%}
-monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
-{% endif -%}
+monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
 
 [kvm-frontend-url-promise]
 # Check that url parameter is complete