summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-07-24 16:42:12 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-07-26 09:57:25 +0200
commit33b992bcd9ec4b4f7896ba79d626ec563016005c (patch)
treef529e6bfc8155611a166d56289aa96720a02083e
parentbe50f16913d2877a6695c8b25d36313a13b255c0 (diff)
lavalab-gen.py: use zmq_auth value
The current script just check for zmq_auth presence and does not check if it is set to false. this patch fix that!
-rwxr-xr-xlavalab-gen.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 4c10109..4c77c2b 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -150,7 +150,7 @@ def main():
fsettings.close()
master_use_zmq_auth = False
if "zmq_auth" in worker:
- master_use_zmq_auth = True
+ master_use_zmq_auth = worker["zmq_auth"]
if master_use_zmq_auth:
if "zmq_auth_key" in worker:
shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/" % workerdir)
@@ -285,6 +285,8 @@ def main():
if fuser["name"] == remote_user:
remote_token = fuser["token"]
if "zmq_auth" in fm:
+ master_use_zmq_auth = fm["zmq_auth"]
+ if master_use_zmq_auth:
if "zmq_auth_key" in fm:
shutil.copy(fm["zmq_auth_key"], "%s/zmq_auth/" % workerdir)
if "zmq_auth_key" in worker: