monitor: fix monitor-url-list not propagated to root instance configuration

software/kvm/common.cfg

@@ -108,7 +108,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = b3ff4f80e4d607e2a977349416c66e39
+md5sum = dd5c37d60f2ea3dc3a7af15718d4ac6c
 download-only = true
 on-update = true
 

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

@@ -8,7 +8,7 @@
 {% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
 {% set kvm_instance_dict = {} -%}
 {% set kvm_hostname_list = [] -%}
-{% set monitor_url_list = [] -%}
+{% set monitor_base_url_dict = {} -%}
 
 {% macro setconfig(name, value) -%}
 {# will set a config-name = value if value is not empty -#}
@@ -128,10 +128,10 @@ return =
 {% if str(kvm_parameter_dict.get('use-tap', 'True')).lower() == 'true' -%}
 {{ '  ' }}tap-ipv4
 
-{% do monitor_url_list.append('${' ~ section ~ ':connection-monitor-base-url}') -%}
 {% do publish_dict.__setitem__('lan-' ~ instance_name, '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% do kvm_hostname_list.append(instance_name ~ ' ' ~ '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% endif -%}
+{% do monitor_base_url_dict.__setitem__(instance_name, '${' ~ section ~ ':connection-monitor-base-url}') -%}
 {% do publish_dict.__setitem__(instance_name ~ '-backend-url', '${' ~ section ~ ':connection-backend-url}') -%}
 {% do publish_dict.__setitem__(instance_name ~ '-url', '${' ~ section ~ ':connection-url}') -%}
 {% do kvm_instance_dict.__setitem__(instance_name, (use_nat, nat_rules_list)) -%}
@@ -245,11 +245,12 @@ cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.of
 username = admin
 password = ${monitor-htpasswd:passwd}
 
-[monitor-conf-parameters]
-monitor-url-list +=
-{% for url in monitor_url_list -%}
-{{ '  ' ~ url }}
+[monitor-base-url-dict]
+{% for key, value in monitor_base_url_dict.items() -%}
+{{ key }} = {{ value }}
 {% endfor %}
+
+[monitor-conf-parameters]
 private-path-list += 
   ${directory:webroot}/
 

stack/monitor/buildout.cfg

@@ -72,7 +72,7 @@ md5sum = 1695c9a06a2b11ccfe893d7a224e489d
 [monitor-conf]
 <= monitor-template-base
 filename = monitor.conf.in
-md5sum = fc65084dd1c2fe2487b58a003b576f61
+md5sum = 888e2845d09bfaa59c25f56f5bcf76b1
 
 [monitor-instance-info]
 <= monitor-template-base

stack/monitor/buildout.hash.cfg

@@ -15,4 +15,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = 93ec5adc7a2b74b16a429f5120c36605
+md5sum = 03254b14a2ff242f7588a307d8c27f23

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -92,12 +92,8 @@ pid-file = ${monitor-directory:pids}/monitor-bootstrap.pid
 randomsleep = {{ bin_directory }}/randomsleep
 
 public-path-list = 
-private-path-list = 
-    ${directory:log}
-# 
-monitor-url-list = 
-  ${monitor-instance-parameter:monitor-url-list}
-
+private-path-list = ${directory:log}
+monitor-url-list = ${monitor-instance-parameter:monitor-url-list}
 parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
 
 parameter-list = 

stack/monitor/templates/monitor.conf.in

 [monitor]
+{% set monitor_url_list = parameter_dict.pop("monitor-url-list", "").strip() -%}
 {% for key, value in parameter_dict.items() -%}
-{% if key == "monitor-url-list" and monitor_base_urls is defined -%}
-{{ key }} =
+{{ key }} = {{ value.strip().replace("\n", "\n  ") }}
+{% endfor -%}
+
+monitor-url-list =
+{% if monitor_url_list -%}
+{{ '  ' ~ monitor_url_list.replace("\n", "\n  ") }}
+{% else -%}
 {% for key, value in monitor_base_urls.items() -%}
 {{ '  ' ~ value }}
 {% endfor -%}
-{% else -%}
-{{ key }} = {{ value.strip().replace("\n", "\n  ") }}
 {% endif -%}
-{% endfor -%}