From 59a2382d39cc04b185eadca1fe174ff54f02b2b2 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Wed, 2 Sep 2015 21:53:12 +0000 Subject: [PATCH] monitor sr: Include test_distributor_url parameter to the networkbench --- software/monitor/network_bench.cfg.in | 4 ++++ software/monitor/software.cfg | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/software/monitor/network_bench.cfg.in b/software/monitor/network_bench.cfg.in index 801a8da39..b07593b07 100644 --- a/software/monitor/network_bench.cfg.in +++ b/software/monitor/network_bench.cfg.in @@ -1,5 +1,9 @@ [network_bench] +{% if slapparameter_dict.get('test_distributor_url', '') not in ["", None] %} +test_distributor_url = {{ slapparameter_dict.get('test_distributor_url', '') }} +{% endif %} + url = {{ slapparameter_dict.get('test_http_url_list', '').split('\n') | join('\n ') }} diff --git a/software/monitor/software.cfg b/software/monitor/software.cfg index aa6afd6ab..a44c3390d 100644 --- a/software/monitor/software.cfg +++ b/software/monitor/software.cfg @@ -41,7 +41,7 @@ md5sum = 1f30b17f5ea11fd033984d17c38bcfd3 [network-bench-cfg] recipe = slapos.recipe.template url = ${:_profile_base_location_}/network_bench.cfg.in -md5sum = a3510050a1b237dc11ab46a9d2b78f56 +md5sum = cfcbf2002b8eff5153e2bf68ed24b720 output = ${buildout:directory}/template-network-bench-cfg.in mode = 0644 @@ -99,11 +99,11 @@ feedparser = 5.1.3 paramiko = 1.15.2 # Required by: -# slapos.toolbox==0.51 +# slapos.toolbox==0.52 lockfile = 0.10.2 # Required by: -# slapos.toolbox==0.51 +# slapos.toolbox==0.52 rpdb = 0.1.5 -- 2.30.9