diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-11-23 09:17:36 +0000 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2020-11-23 10:01:35 +0000 |
| commit | a9c41d2882d4b63f201e43fde959f375bdc3c2ad (patch) | |
| tree | b0939c0df5b0ac05552820d65fbe166a020e70ee /lavalab-gen.py | |
| parent | 13dcdb52eb69f3a022244e840e7d671375133702 (diff) | |
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.
Diffstat (limited to 'lavalab-gen.py')
| -rwxr-xr-x | lavalab-gen.py | 2 |
1 files changed, 2 insertions, 0 deletions
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 |