aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-10-30 09:35:47 +0100
committerCorentin LABBE <clabbe@baylibre.com>2018-11-02 10:26:57 +0100
commit66e65375f30137e5320766403a1b23069b4cd5cd (patch)
tree3e77ddde028e59c73f5b0ca4d833843c3e32559b
parentfb1104d60ec85e3698395e7874a2d670ab39a41d (diff)
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.
-rw-r--r--README.md1
-rwxr-xr-xlavalab-gen.py7
2 files changed, 7 insertions, 1 deletions
diff --git a/README.md b/README.md
index 4c1ea18..01b3f83 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,7 @@ masters:
zmq_auth: True/False Does the master requires ZMQ authentication.
zmq_auth_key: optional path to a public ZMQ key
zmq_auth_key_secret: optional path to a private ZMQ key
+ slave_keys: optional path to a directory with slaves public key. Usefull when you want to create a master without slaves nodes in boards.yaml.
persistent_db: True/False (default False) Is the postgres DB is persistent over reboot
http_fqdn: The FQDN used to access the LAVA web interface. This is necessary if you use https otherwise you will issue CSRF errors.
users:
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" ]