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 --- docker-compose.template | 2 +- lava-slave/Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.template b/docker-compose.template index d7986ec..218253b 100644 --- a/docker-compose.template +++ b/docker-compose.template @@ -29,7 +29,7 @@ services: ports: - "69:69/udp" - "80:80" - - "55980-56000:55980-56000" + - "61950-62000:61950-62000" links: - "lava-master" squid: 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 1.2.3-korg