From bef146de0b531182b09a43f366fa2b8318ffe52b Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Jan 2018 14:12:33 +0100 Subject: Move XNBD ports outside of dynamic port range Under Linux, dynamic port range is 32768-60999, so a clash is possible with XNBD port range. Furthermore XNBD constants file have changed in 2017.11 --- lava-slave/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lava-slave') diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 5e0f3cb..a5e1bbf 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -60,8 +60,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install postgresql RUN service postgresql start && DEBIAN_FRONTEND=noninteractive apt-get -y install lavapdu-daemon lavapdu-client && service postgresql stop COPY lavapdu.conf /etc/lavapdu/ -#TODO made this customizable, 1000 ports by default is too much -RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=55950,' /usr/lib/python2.7/dist-packages/lava_dispatcher/pipeline/utils/constants.py +# Caution to not use any port between the Linux dynamic port range: 32768-60999 +RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py +RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py EXPOSE 69/udp 80 -- cgit From 83781cf3177ae2928221c424caeb2bd880d6cc6c Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Jan 2018 14:16:22 +0100 Subject: Use cu package from testing Some boards need cu > 1.07-24 It exists only in debian testing, so add a hack for getting it. --- lava-slave/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lava-slave') diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index a5e1bbf..d2f3191 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -64,6 +64,12 @@ COPY lavapdu.conf /etc/lavapdu/ RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py +#conmux need cu >= 1.07-24 See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336996 +RUN echo "deb http://debian.proxad.net/debian/ testing main" >> /etc/apt/sources.list.d/testing.list +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu +RUN rm /etc/apt/sources.list.d/testing.list + EXPOSE 69/udp 80 CMD /start.sh -- cgit From b2de2b9347e0e7f31be336d865263524c86c71b3 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Jan 2018 14:22:28 +0100 Subject: Fix libguestfs on slave Libguestfs actions are done by the dispatcher, so the slave must be able to do them. In the same time, add a TODO for setting volumes as read_only. --- lava-slave/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'lava-slave') diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index d2f3191..fcaa0cc 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update COPY scripts/stop.sh . COPY scripts/start.sh . +# e2fsprogs is for libguestfs RUN \ echo 'lava-server lava-server/instance-name string lava-slave-instance' | debconf-set-selections && \ echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections && \ -- cgit