diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-04-12 11:59:07 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-06-05 15:36:31 +0200 |
| commit | 31555bcb6555d080e7072fba2fc8ccda0fd59eaa (patch) | |
| tree | e70c096e7714be50f2d7b9f4419f07dbe4452ec7 /lava-master | |
| parent | 287e03c09e34ec77d696fcd7ad55912cc127a859 (diff) | |
Implement Multipleslave
This patch implement multiple slave support.
Instead of having a maximum of one master and one slave in one docker
image, it is now possible to have multiple slave accross several docker
host.
For helping this change, a new boards.yaml format is introduced (See
README.md for details)
Note that tokens.yaml is also squashed in boards.yaml
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 2 | ||||
| -rwxr-xr-x | lava-master/scripts/setup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index a65fd9a..b475c8c 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -66,11 +66,11 @@ COPY devices/ /root/devices/ COPY device-types/ /root/device-types/ COPY users/ /root/lava-users/ COPY tokens/ /root/lava-callback-tokens/ -COPY slaves/* /etc/lava-server/dispatcher.d/ COPY scripts/setup.sh / RUN /start.sh && /setup.sh && /stop.sh #uncomment if you want to use squid +# warning the address used must be network accessible by all slave #RUN sed -i 's,^.*http_proxy:.*, http_proxy: http://squid:3128,' /etc/lava-server/env.yaml #comment this if you do HTTPS (For reenabling CSRF cookie) diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh index 5b62c45..3ab2abd 100755 --- a/lava-master/scripts/setup.sh +++ b/lava-master/scripts/setup.sh @@ -45,7 +45,7 @@ if [ -e /root/lava-callback-tokens ];then exit 1 fi echo "Adding $USER ($DESCRIPTION) DEBUG($TOKEN)" - lava-server manage tokens add --user $USER --secret $TOKEN --description $DESCRIPTION || exit 1 + lava-server manage tokens add --user $USER --secret $TOKEN --description "$DESCRIPTION" || exit 1 done fi |