stack/erp5: Add monitor-publish-parameters to all partitions

stack/erp5/buildout.hash.cfg

@@ -19,15 +19,15 @@ md5sum = 1e89de954d816b93f76d9b75820d192c
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 18ff195d951cc58de84aaad58b782db3
+md5sum = 744d99b226fb3e31ea2108288d2d21a0
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
-md5sum = fd3e94d804d35ce7b6a4ee1cc0f01021
+md5sum = 4188476e65f2f7751c15a92143a64559
 
 [template-cloudooo]
 filename = instance-cloudoo.cfg.in
-md5sum = 099f49bff1e9cb1a1634389eaf9f6d23
+md5sum = 902fee5c1fa411efb2da732088e794d1
 
 [template-zope-conf]
 filename = zope.conf.in
@@ -79,19 +79,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 7e8233dcc54ee6dd4bba9a0c63f6f169
+md5sum = 236170c37b0fb549a7482f3745c4c0d2
 
 [template-zeo]
 filename = instance-zeo.cfg.in
-md5sum = 1783162199af98a6a080da8d5fd45ad0
+md5sum = 2248d249cfc53c73e7c65665d4d53be0
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = a1752fa61ef7a77c0170f92cfe68085a
+md5sum = adc5113787310f282a9c8d1ce33224b9
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = dd8dfd5d3cf9429ef3ae16d605190052
+md5sum = 3fc9735df6c76bbe1f8505b0be3d5d9f
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -159,6 +159,7 @@ recipe = slapos.cookbook:publish.serialised
 {{   family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %}
 {{   family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
 {% endfor -%}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 [apache-ssl]
 {% if ssl_parameter_dict.get('key') -%}

stack/erp5/instance-cloudoo.cfg.in

@@ -20,6 +20,7 @@ url = http://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
 {% else -%}
 url = http://${cloudooo-instance:ip}:${cloudooo-instance:port}/
 {% endif -%}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 [cloudooo-instance]
 recipe = slapos.cookbook:generic.cloudooo

stack/erp5/instance-erp5.cfg.in

@@ -324,10 +324,10 @@ parts +=
 [publish-connection-information]
 <= monitor-publish
 
-[monitor-instance-parameter]
+[monitor-conf-parameters]
 monitor-title = ERP5 monitor
-password = $monitor-passwd:passwd
-monitor-url-list += 
+password = ${monitor-passwd:passwd}
+monitor-url-list =
 {% for url in monitor_base_url_list -%}
 {{ '  ' ~ url }}
 {% endfor %}

stack/erp5/instance-kumofs.cfg.in

@@ -20,6 +20,7 @@ url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
 {% else -%}
 url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
 {% endif -%}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 [kumofs-instance]
 recipe = slapos.cookbook:generic.kumofs

stack/erp5/instance-mariadb.cfg.in

@@ -33,6 +33,7 @@ recipe = slapos.cookbook:publish.serialised
 {% endmacro -%}
 database-list = {{ render_database_list(database_list) }}
 test-database-list = {{ render_database_list(test_database_list) }}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 [publish-early]
 recipe = slapos.cookbook:publish-early

stack/erp5/instance-zeo.cfg.in

@@ -113,6 +113,7 @@ tidstorage-port = ${tidstorage:port}
 tidstorage-ip =
 tidstorage-port =
 {% endif -%}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 # Used for ERP5 resiliency or (more probably)
 # webrunner resiliency with erp5 inside.

stack/erp5/instance-zope.cfg.in

@@ -379,6 +379,7 @@ dict toward erp5 partition, violating the DRY principle and making the intent
 hard to guess.
 -#}
 hosts-dict = {{ dumps(hosts_dict) }}
+monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 
 [erp5-promise]
 recipe = slapos.cookbook:erp5.promise