stack/erp5: rename an internal parameter still mentioning apache

software/slapos-master/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = c605292e57a12e42d9c2676e38c072c6
+md5sum = 1fbfca2d64a9824054f7a3281e71efdc
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -309,7 +309,7 @@ config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_pa
 config-publisher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout)) }}
 config-activity-timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout)) }}
 {%   if test_runner_enabled -%}
-config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
+config-test-runner-balancer-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
 
 [{{ promise_software_url_section_name }}]
 # Promise to wait for zope partition to use the expected software URL,

stack/erp5/buildout.hash.cfg

@@ -74,7 +74,7 @@ md5sum = 55232eae0bcdb68a7cb2598d2ba9d60c
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 2bb2addc8deddff00053a065f5e2793e
+md5sum = 359bab24aec7772adb5d822c1389b1bd
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 8a2c78000e1e791dc48305a2e7330b16
+md5sum = 2439b90d6f707f47050fc9074fa4d810
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -321,12 +321,12 @@ config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_pa
 config-publisher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout)) }}
 config-activity-timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout)) }}
 {%   if test_runner_enabled -%}
-config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
+config-test-runner-balancer-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
 
 [{{ check_test_runner_url_section_name }}]
 # Promise to wait for zope partition to receive the expected test-runner URL
 recipe = slapos.cookbook:check_parameter
-value = {{ '${' ~ section_name ~ ':config-test-runner-apache-url-list}' }}
+value = {{ '${' ~ section_name ~ ':config-test-runner-balancer-url-list}' }}
 expected-not-value = not-ready
 expected-value =
 path = ${directory:bin}/${:_buildout_section_name_}

stack/erp5/instance-zope.cfg.in

@@ -523,7 +523,7 @@ command-line-extra =
   --erp5_sql_connection_string '{{ connection_string_list[0] }}'
   --extra_sql_connection_string_list '{{ ','.join(connection_string_list[1:]) }}'
   --zserver {{ test_runner_address_list[0][0] ~ ':' ~ test_runner_address_list[0][1] }}
-  --zserver_frontend_url {{ slapparameter_dict['test-runner-apache-url-list'][0] }}
+  --zserver_frontend_url {{ slapparameter_dict['test-runner-balancer-url-list'][0] }}
   {% if test_runner_random_activity_priority is not none %}
     --random_activity_priority={{ test_runner_random_activity_priority }}
   {%- endif %}
@@ -540,21 +540,21 @@ environment-extra +=
   {%   do zserver_address_list.append(ip ~ ':' ~ port) %}
   {% endfor -%}
   zserver_address_list={{ ','.join(zserver_address_list) }}
-  zserver_frontend_url_list={{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }}
+  zserver_frontend_url_list={{ ','.join(slapparameter_dict['test-runner-balancer-url-list']) }}
 
-[promise-test-runner-apache-url-executable]
-# promise to wait for apache partition to have returned the parameter
+[promise-test-runner-balancer-url-executable]
+# promise to wait for balancer partition to have returned the parameter
 recipe = slapos.cookbook:check_parameter
-value = {{ slapparameter_dict['test-runner-apache-url-list'] }}
+value = {{ slapparameter_dict['test-runner-balancer-url-list'] }}
 expected-not-value = not-ready
 path = ${directory:bin}/${:_buildout_section_name_}
 expected-value =
 
-[{{ section("promise-test-runner-apache-url") }}]
+[{{ section("promise-test-runner-balancer-url") }}]
 <= monitor-promise-base
 promise = check_command_execute
 name = ${:_buildout_section_name_}.py
-config-command = ${promise-test-runner-apache-url-executable:path}
+config-command = ${promise-test-runner-balancer-url-executable:path}
 
 {%-   endif %}
 {%- endif %}