X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d318cc5c2459aa2fa9b25323b5b94eeeb6b63775..77f11805c9daf93356ad083f03841b546aab9c7d:/docker/compute/setup.sh.in diff --git a/docker/compute/setup.sh.in b/docker/compute/setup.sh.in index 6a4e95160a..efb2c4148e 100755 --- a/docker/compute/setup.sh.in +++ b/docker/compute/setup.sh.in @@ -5,19 +5,23 @@ export ARVADOS_API_HOST=api export ARVADOS_API_HOST_INSECURE=yes export ARVADOS_API_TOKEN=@@API_SUPERUSER_SECRET@@ +export HOME=/root # Wait for API server to come up. while ! arv user current ; do sleep 1 ; done -arv node create --node {} > /tmp/node.json +if ! test -f /root/node.json ; then + arv node create --node "{\"hostname\": \"$(hostname)\"}" > /root/node.json -UUID=`grep \"uuid\" /tmp//node.json |cut -f4 -d\"` -PING_SECRET=`grep \"ping_secret\" /tmp//node.json |cut -f4 -d\"` + # Make sure /dev/fuse permissions are correct (the device appears after fuse is loaded) + chmod 1660 /dev/fuse && chgrp fuse /dev/fuse +fi -echo "*/5 * * * * root /usr/bin/curl -k -d ping_secret=$PING_SECRET https://api/arvados/v1/nodes/$UUID/ping" > /etc/cron.d/node_ping +UUID=`grep \"uuid\" /root/node.json |cut -f4 -d\"` +PING_SECRET=`grep \"ping_secret\" /root/node.json |cut -f4 -d\"` -# Send a ping now -/usr/bin/curl -k -d ping_secret=$PING_SECRET https://api/arvados/v1/nodes/$UUID/ping?ping_secret=$PING_SECRET +if ! test -f /etc/cron.d/node_ping ; then + echo "*/5 * * * * root /usr/bin/curl -k -d ping_secret=$PING_SECRET https://api/arvados/v1/nodes/$UUID/ping" > /etc/cron.d/node_ping +fi -# Just make sure /dev/fuse permissions are correct (the device appears after fuse is loaded) -chmod 1660 /dev/fuse && chgrp fuse /dev/fuse +/usr/bin/curl -k -d ping_secret=$PING_SECRET https://api/arvados/v1/nodes/$UUID/ping?ping_secret=$PING_SECRET