diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2021-02-08 07:37:46 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-02-08 07:37:46 -0800 |
| commit | 8fa118db5f312d5b6a9ae9acbc3113423dd31f68 (patch) | |
| tree | aaaac7d9a7337055b3cf86dcc29c908927f45c0b /lavalab-gen.py | |
| parent | 6139a1e516587c852df87db89bde48780d181119 (diff) | |
| parent | 5d49e030896a59ec83250d93352f3d37ae8ff364 (diff) | |
Merge pull request #134 from montjoie/prepare-2021.x
Prepare 2021.x
Diffstat (limited to 'lavalab-gen.py')
| -rwxr-xr-x | lavalab-gen.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py index e4b3487..e901eb7 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -407,7 +407,7 @@ def main(): "devices", "dispatcher_ip", "default_slave", "extra_actions", "export_ser2net", "expose_ser2net", "expose_ports", "env", "host", "host_healthcheck", - "loglevel", "lava-coordinator", + "loglevel", "lava-coordinator", "lava_worker_token", "name", "remote_user", "remote_master", "remote_address", "remote_rpc_port", "remote_proto", "remote_user_token", "tags", @@ -493,6 +493,8 @@ def main(): else: remote_rpc_port = worker["remote_rpc_port"] dockcomp["services"][worker_name]["environment"]["LAVA_MASTER"] = remote_address + if "lava_worker_token" in worker: + dockcomp["services"][worker_name]["environment"]["LAVA_WORKER_TOKEN"] = worker["lava_worker_token"] remote_user = worker["remote_user"] # find master remote_token = "BAD" |