diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-01-11 11:45:07 +0100 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-02-02 14:25:44 +0100 |
| commit | 17eb55c52985bb68ac7666ca1afa5b5f848b7b53 (patch) | |
| tree | fb0075d07238fdc8c82963f3f46063f862d78761 /lava-slave | |
| parent | f8d352597e7629b4868024c933deca1ea8ea8c68 (diff) | |
Remove lavapdu support and replace with pdu_generic
Recent lavapdu is unpackaged and buggy.
Remove it and replace with a generic PDU command line wrapper
Diffstat (limited to 'lava-slave')
| -rw-r--r-- | lava-slave/Dockerfile | 5 | ||||
| -rwxr-xr-x | lava-slave/scripts/start.sh | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 8f7ba82..6f2181e 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -46,11 +46,6 @@ COPY configs/tftpd-hpa /etc/default/tftpd-hpa COPY scripts/cu-loop /usr/local/bin/ COPY conmux/* /etc/conmux/ -#install pdudaemon -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/ - # 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 diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index c9645b3..dcbbcd7 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -10,17 +10,6 @@ service tftpd-hpa start || exit 4 rm -f /var/run/lava-slave.pid service lava-slave start || exit 5 -if [ -e /etc/lavapdu ];then - /etc/init.d/postgresql start || exit 6 - - echo "== Start lavapdu listen ==" - /etc/init.d/lavapdu-listen start || exit 7 - # lava listen create the database, let it some time - sleep 5 - echo "== Start lavapdu runner ==" - /etc/init.d/lavapdu-runner start || exit 8 -fi - touch /var/run/conmux-registry /usr/sbin/conmux-registry 63000 /var/run/conmux-registry& sleep 2 |