diff options
| author |   khilman <khilman@users.noreply.github.com> | 2019-05-16 08:15:51 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-05-16 08:15:51 -0700 |
| commit | 620e8e50b3d71709b28bafb6b5eac7fcea7e6bc5 (patch) | |
| tree | 623814a65b61818122f64ebd3a860fef05669714 /lava-slave | |
| parent | 7f0a27d56c83e053e00497d30bd56f40cc63b533 (diff) | |
| parent | 6f153a0ac4d9361aa0f8ecf7d2ba30e16bddc274 (diff) | |
Merge pull request #89 from montjoie/enhance-2019.03-2
Enhance 2019.03 2
Diffstat (limited to 'lava-slave')
| -rw-r--r-- | lava-slave/Dockerfile | 7 | ||||
| -rw-r--r-- | lava-slave/lava-coordinator/.empty | 0 | ||||
| -rwxr-xr-x | lava-slave/scripts/setup.sh | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 60f574c..d6375f2 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -53,6 +53,13 @@ RUN apt-get -y install patch COPY lava-patch/ /root/lava-patch RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch) ; do patch -p1 < $patch || exit $?;done +RUN mkdir /etc/lava-coordinator/ +COPY lava-coordinator/* /etc/lava-coordinator/ +RUN if [ -e /etc/lava-coordinator/lava-coordinator.cnf ]; then DEBIAN_FRONTEND=noninteractive apt-get -y install lava-coordinator && mv /etc/lava-coordinator/lava-coordinator.cnf /etc/lava-coordinator/lava-coordinator.conf ; fi + +# needed for lavacli identities +RUN mkdir -p /root/.config + COPY devices/ /root/devices/ COPY tags/ /root/tags/ COPY deviceinfo/ /root/deviceinfo/ diff --git a/lava-slave/lava-coordinator/.empty b/lava-slave/lava-coordinator/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lava-slave/lava-coordinator/.empty diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh index 0b8a0b2..fce01f8 100755 --- a/lava-slave/scripts/setup.sh +++ b/lava-slave/scripts/setup.sh @@ -10,6 +10,8 @@ if [ -z "$LAVA_MASTER_URI" ];then exit 11 fi +lavacli identities add --uri $LAVA_MASTER_BASEURI --token $LAVA_MASTER_TOKEN --username $LAVA_MASTER_USER default + echo "Dynamic slave for $LAVA_MASTER ($LAVA_MASTER_URI)" LAVACLIOPTS="--uri $LAVA_MASTER_URI" |