From 66e65375f30137e5320766403a1b23069b4cd5cd Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 30 Oct 2018 09:35:47 +0100 Subject: lavalab-gen.py: Add slave_keys for copying public slave keys When creating a split boards.yaml with only one master which uses ZMQ, no way to adds slave key exists. This patch fix that by adding a way to copy all slave keys. --- lavalab-gen.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lavalab-gen.py') diff --git a/lavalab-gen.py b/lavalab-gen.py index 3dd8eb4..7061a72 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -93,7 +93,7 @@ def main(): else: masters = workers["masters"] for master in masters: - keywords_master = [ "name", "type", "host", "users", "groups", "tokens", "webadmin_https", "persistent_db", "zmq_auth", "zmq_auth_key", "zmq_auth_key_secret", "http_fqdn" ] + keywords_master = [ "name", "type", "host", "users", "groups", "tokens", "webadmin_https", "persistent_db", "zmq_auth", "zmq_auth_key", "zmq_auth_key_secret", "http_fqdn", "slave_keys" ] for keyword in master: if not keyword in keywords_master: print("WARNING: unknown keyword %s" % keyword) @@ -166,6 +166,11 @@ def main(): else: zmq_auth_genlist.write("%s/%s\n" % (host, name)) need_zmq_auth_gen = True + if "slave_keys" in worker: + src_files = os.listdir(worker["slave_keys"]) + for file_name in src_files: + full_file_name = os.path.join(worker["slave_keys"], file_name) + shutil.copy(full_file_name, "%s/zmq_auth/" % workerdir) if "users" in worker: for user in worker["users"]: keywords_users = [ "name", "staff", "superuser", "password", "token", "email", "groups" ] -- cgit 1.2.3-korg