Merge pull request #127 from montjoie/misc-09-2020

Misc 09 2020

3 files changed, 35 insertions, 8 deletions

diff --git a/README.md b/README.md
index bb4b02f..220221b 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ The following packages are necessary on the host machine:
 * docker-compose
 * pyyaml
 
+If you plan to use docker/fastboot tests, you will need probably also to install lava-dispatcher-host.
+
 ## Quickstart
 Example to use lava-docker with only one QEMU device:
 
@@ -410,6 +412,31 @@ For running all images, simply run:
 docker-compose up -d
 ```
 
+### Enabling ZMQ encryption
+Enabling ZMQ is all or nothing.
+You need to generate keys for both master AND workers.
+Generate thoses keys via:
+```
+zmqauth/zmq_auth_gen/create_certificate.py --directory . nameofyourworker
+```
+This will produce two files:
+* A public key ending with ".key"
+* A private key ending with ".key_secret"
+
+Since ZMQ keys does not store any information like name, filename could be different between master and workers.
+
+As general note, LAVA will use the hostname (and so the name in the master/worker node) for finding ZMQ keys.
+
+#### Naming convention for master
+ZMQ key for master should be named according to the name used in master node.
+ZMQ key for worker should be named according to the name in the worker node
+lava-docker will automaticly copy master zmq_auth_key/zmq_auth_key_secret to name.key/name.key_secret
+
+#### Naming convention for workers
+ZMQ public key for master should be named according to the remote_address used in worker node.
+ZMQ key for worker should be named according to the name in the worker node
+lava-docker will automaticly copy master zmq_auth_master_key to remote_address.key
+
 ## Proxy cache (Work in progress)
 A squid docker is provided for caching all LAVA downloads (image, dtb, rootfs, etc...)<br/>
 For the moment, it is unsupported and unbuilded.
diff --git a/backup.sh b/backup.sh
index 3edd133..2f5f748 100755
--- a/backup.sh
+++ b/backup.sh
@@ -15,19 +15,19 @@ if [ -z "$DOCKERID" ];then
 	exit 1
 fi
 
-docker exec -t $DOCKERID tar czf /root/devices.tar.gz /etc/lava-server/dispatcher-config/devices/ || exit $?
+docker exec $DOCKERID tar czf /root/devices.tar.gz /etc/lava-server/dispatcher-config/devices/ || exit $?
 docker cp $DOCKERID:/root/devices.tar.gz $BACKUP_DIR/ || exit $?
 
 # for an unknown reason pg_dump > file doesnt work
-docker exec -t $DOCKERID sudo -u postgres pg_dump --create --clean lavaserver --file /tmp/db_lavaserver || exit $?
-docker exec -t $DOCKERID gzip /tmp/db_lavaserver || exit $?
+docker exec $DOCKERID sudo -u postgres pg_dump --create --clean lavaserver --file /tmp/db_lavaserver || exit $?
+docker exec $DOCKERID gzip /tmp/db_lavaserver || exit $?
 docker cp $DOCKERID:/tmp/db_lavaserver.gz $BACKUP_DIR/ || exit $?
-docker exec -t $DOCKERID rm /tmp/db_lavaserver.gz || exit $?
+docker exec $DOCKERID rm /tmp/db_lavaserver.gz || exit $?
 
 # tar outputs warnings when file changes on disk while creating tar file. So do not "exit on error"
-docker exec -t $DOCKERID tar czf /root/joboutput.tar.gz /var/lib/lava-server/default/media/job-output/ || echo "WARNING: tar operation returned $?"
+docker exec $DOCKERID tar czf /root/joboutput.tar.gz /var/lib/lava-server/default/media/job-output/ || echo "WARNING: tar operation returned $?"
 docker cp $DOCKERID:/root/joboutput.tar.gz $BACKUP_DIR/ || exit $?
-docker exec -t $DOCKERID rm /root/joboutput.tar.gz || exit $?
+docker exec $DOCKERID rm /root/joboutput.tar.gz || exit $?
 
 echo "Backup done in $BACKUP_DIR"
 rm -f backup-latest
diff --git a/deploy.sh b/deploy.sh
index f7be5be..76fa2aa 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,8 +5,8 @@ BEROOT=""
 if [ $(id -u) -ne 0 ];then
 	BEROOT="sudo "
 fi
-$BEROOT rm /etc/udev/rules.d/*lava*rules
-$BEROOT cp udev/*lava*rules /etc/udev/rules.d/
+$BEROOT rm /etc/udev/rules.d/*lavaworker-udev*rules
+$BEROOT cp udev/*lavaworker-udev*rules /etc/udev/rules.d/
 $BEROOT udevadm control --reload-rules || exit $?
 $BEROOT udevadm trigger || exit $?