diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | lava-slave/Dockerfile | 2 | ||||
| -rwxr-xr-x | lavalab-gen.py | 7 |
3 files changed, 9 insertions, 2 deletions
@@ -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: @@ -260,6 +261,7 @@ slaves: boards: - name: devicename Each board must be named by their device-type as "device-type-XX" (where XX is a number) type: the LAVA device-type of this device + slave: (optional) Name of the slave managing this device. Default to first slave found or default_slave if set. kvm: (For qemu only) Does the qemu could use KVM (default: no) uboot_ipaddr: (optional) a static IP to set in uboot uboot_macaddr: (Optional) the MAC address to set in uboot diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 7b811bf..e93764d 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -41,7 +41,7 @@ COPY devices/ /root/devices/ COPY tags/ /root/tags/ COPY deviceinfo/ /root/deviceinfo/ -RUN if [ -x /root/extra_actions ] ; then /root/extra_actions ; fi +RUN if [ -x /usr/local/bin/extra_actions ] ; then /usr/local/bin/extra_actions ; fi RUN apt-get -y install screen openssh-server RUN ssh-keygen -q -f /root/.ssh/id_rsa 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" ] |