From a9c41d2882d4b63f201e43fde959f375bdc3c2ad Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 23 Nov 2020 09:17:36 +0000 Subject: Handle 2020.09+ workers Since 2020.09, workers does not use ZMQ anymore but use a token. This patch permit our setup to detecte when we use LAVA 2020.09+ and retrieve it from master. --- lavalab-gen.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lavalab-gen.py') diff --git a/lavalab-gen.py b/lavalab-gen.py index d088bbb..e2e0607 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -546,7 +546,9 @@ def main(): else: remote_proto = worker["remote_proto"] remote_uri = "%s://%s:%s@%s:%s/RPC2" % (remote_proto, remote_user, remote_token, remote_address, remote_rpc_port) + remote_master_url = "%s://%s:%s" % (remote_proto, remote_address, remote_rpc_port) dockcomp["services"][worker_name]["environment"]["LAVA_MASTER_URI"] = remote_uri + dockcomp["services"][worker_name]["environment"]["LAVA_MASTER_URL"] = remote_master_url dockcomp["services"][worker_name]["environment"]["LAVA_MASTER_USER"] = remote_user dockcomp["services"][worker_name]["environment"]["LAVA_MASTER_BASEURI"] = "%s://%s:%s/RPC2" % (remote_proto, remote_address, remote_rpc_port) dockcomp["services"][worker_name]["environment"]["LAVA_MASTER_TOKEN"] = remote_token -- cgit 1.2.3-korg