diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 22a768f962cc6f94bdda5fdc8e9014b3ef53487d..b9f5e0e2507a2247625d7c16d7f98c445a1eb828 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -208,7 +208,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = 55a4a8957ac0cb9462fadafe9a2fe378 +md5sum = 36ba0ca411fac348faa95ac7c0892e96 extra-context = key apache_location apache:location key aspell_location aspell:location @@ -287,7 +287,7 @@ md5sum = f271a904e7cc0039ce109f592fb48b5f [template-scalability] < = download-base filename = instance-scalability.cfg.in -md5sum = 6d33726c7cbe727fe7175080864e3ea1 +md5sum = fbbfece0272b819cda88895b6cb7258a [template-zeo] < = download-base diff --git a/stack/erp5/instance-scalability.cfg.in b/stack/erp5/instance-scalability.cfg.in index b33be21cac36343478710db2f2cd0742b6a9685f..49a57eee0b6f42b7b5b7c14d2cbede6867fb97a1 100644 --- a/stack/erp5/instance-scalability.cfg.in +++ b/stack/erp5/instance-scalability.cfg.in @@ -24,24 +24,18 @@ config = ${:extra-config} extra-config = config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} -return = url - [launcher-param] binary-path = ${rootdirectory:bin}/launcher wrapper-path = ${rootdirectory:bin}/launcher -log-path = ${basedirectory:log}/scalability_launcher.log +log-path = ${basedirectory:log}/launcher.log test-suite-title = {{ slapparameter_dict.get('test-suite-title', '') }} [binary-wrap-launcher] recipe = slapos.cookbook:wrapper -command-line = "{{ parameter_dict['launcher-location'] }}/bin/launcher \ ---test_suite_title Bonjour --log ${launcher-param:log-path}" +command-line = "${launcher-param:binary-path} --test_suite_title ${launcher-param:test-suite-title} --log ${launcher-param:log-path}" output = ${launcher-param:binary-path} - -# -# voir : instance-mariadb.cfg.in ... (ou pas) -# +return = url [basedirectory] diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index 0ca9b6b3676ce5d175f74d14b45bfec02d56f752..67a356fb869c2b22ecbc2653e0d92c4dcef4192a 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -169,6 +169,7 @@ template = {{ template_scalability }} filename = instance-scalability.cfg extensions = jinja2.ext.do extra-context = + key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository # Must match the key id in [switch-softwaretype] which uses this section. raw software_type scalability