From 49d59f4fa7b6f6dc99bbb56e30c94b5ae692f2f7 Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Wed, 25 Oct 2017 12:12:12 +0200
Subject: Move master files in lava-master

---
 lava-master/scripts/start.sh | 37 +++++++++++++++++++++++++++++++++++++
 lava-master/scripts/stop.sh  | 10 ++++++++++
 2 files changed, 47 insertions(+)
 create mode 100755 lava-master/scripts/start.sh
 create mode 100755 lava-master/scripts/stop.sh

(limited to 'lava-master/scripts')

diff --git a/lava-master/scripts/start.sh b/lava-master/scripts/start.sh
new file mode 100755
index 0000000..f4cc4eb
--- /dev/null
+++ b/lava-master/scripts/start.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+postgres-ready () {
+  echo "Waiting for lavaserver database to be active"
+  while (( $(ps -ef | grep -v grep | grep postgres | grep lavaserver | wc -l) == 0 ))
+  do
+    echo -n "."
+    sleep 1
+  done
+  echo 
+  echo "[ ok ] LAVA server ready"
+}
+
+start () {
+  echo "Starting $1"
+  if (( $(ps -ef | grep -v grep | grep -v add_device | grep -v dispatcher-config | grep "$1" | wc -l) > 0 ))
+  then
+    echo "$1 appears to be running"
+  else
+    service "$1" start
+  fi
+}
+
+#remove lava-pid files incase the image is stored without first stopping the services
+rm -f /var/run/lava-*.pid 2> /dev/null
+
+start postgresql
+start apache2
+start lava-server
+start lava-master
+start lava-coordinator
+start lava-slave
+start lava-server-gunicorn
+start tftpd-hpa
+
+postgres-ready
+service apache2 reload #added after the website not running a few times on boot
diff --git a/lava-master/scripts/stop.sh b/lava-master/scripts/stop.sh
new file mode 100755
index 0000000..ccf30fb
--- /dev/null
+++ b/lava-master/scripts/stop.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+service lava-master stop
+service lava-slave stop
+service lava-server stop
+service lava-coordinator stop
+service lava-server-gunicorn stop
+service apache2 stop
+service postgresql stop
+service tftpd-hpa stop
-- 
cgit 1.2.3-korg


From 626402f90d0f8435e9268268180d46fe3b58f040 Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Wed, 25 Oct 2017 13:37:34 +0200
Subject: Handle generated files

This commit add suppot for generated files by lalalab-gen.py.
---
 lava-master/Dockerfile          |  7 ++++
 lava-master/device-types/.empty |  0
 lava-master/scripts/setup.sh    | 74 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 lava-master/device-types/.empty
 create mode 100755 lava-master/scripts/setup.sh

(limited to 'lava-master/scripts')

diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 942f1f6..4fd4148 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -65,6 +65,13 @@ RUN /start.sh \
 
 COPY configs/tftpd-hpa /etc/default/tftpd-hpa
 
+COPY devices/ /root/devices/
+COPY device-types/ /root/device-types/
+COPY users/ /root/lava-users/
+COPY tokens/ /root/lava-callback-tokens/
+COPY scripts/setup.sh /
+RUN /start.sh && /setup.sh && /stop.sh
+
 EXPOSE 69/udp 80 3079 5555 5556
 
 CMD /start.sh && bash
diff --git a/lava-master/device-types/.empty b/lava-master/device-types/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh
new file mode 100755
index 0000000..011a9c7
--- /dev/null
+++ b/lava-master/scripts/setup.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+if [ -e /root/lava-users ];then
+	for ut in $(ls /root/lava-users)
+	do
+		# User is the filename
+		USER=$ut
+		. /root/lava-users/$ut
+		if [ -z "$PASSWORD" -o "$PASSWORD" = "$TOKEN" ];then
+			echo "Generating password..."
+			#Could be very long, should be avoided
+			PASSWORD=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+		fi
+		echo "Adding username $USER DEBUG(with $TOKEN / $PASSWORD)"
+		lava-server manage users add --passwd $PASSWORD $USER || exit 1
+		if [ ! -z "$TOKEN" ];then
+			lava-server manage tokens add --user $USER --secret $TOKEN || exit 1
+		fi
+	done
+fi
+
+if [ -e /root/lava-callback-tokens ];then
+	for ct in $(ls /root/lava-callback-tokens)
+	do
+		. /root/lava-callback-tokens/$ct
+		if [ -z "$USER" ];then
+			echo "Missing USER"
+			exit 1
+		fi
+		if [ -z "$TOKEN" ];then
+			echo "Missing TOKEN for $USER"
+			exit 1
+		fi
+		if [ -z "$DESCRIPTION" ];then
+			echo "Missing DESCRIPTION for $USER"
+			exit 1
+		fi
+		echo "Adding $USER ($DESCRIPTION) DEBUG($TOKEN)"
+		lava-server manage tokens add --user $USER --secret $TOKEN --description $DESCRIPTION || exit 1
+	done
+fi
+
+# This directory is used for storing device-types already added
+mkdir -p /root/.lavadocker/
+if [ -e /root/device-types ];then
+	for i in $(ls /root/device-types/*yaml)
+	do
+		cp /root/device-types/$i /etc/lava-server/dispatcher-config/device-types/
+		devicetype=$(basename $i)
+		lava-server manage device-types add $devicetype || exit 1
+		touch /root/.lavadocker/devicetype-$devicetype
+	done
+fi
+
+for worker in $(ls /root/devices/)
+do
+	echo "Adding worker $worker"
+	lava-server manage workers add $worker || exit $?
+	for device in $(ls /root/devices/$worker/)
+	do
+		devicename=$(echo $device | sed 's,.jinja2,,')
+		devicetype=$(grep -h extends /root/devices/$worker/$device| grep -o '[a-zA-Z0-9_-]*.jinja2' | sed 's,.jinja2,,')
+		if [ -e /root/.lavadocker/devicetype-$devicetype ];then
+			echo "Skip devicetype $devicetype"
+		else
+			echo "Add devicetype $devicetype"
+			lava-server manage device-types add $devicetype || exit $?
+			touch /root/.lavadocker/devicetype-$devicetype
+		fi
+		echo "Add device $devicename on $worker"
+		cp /root/devices/$worker/$device /etc/lava-server/dispatcher-config/devices/ || exit $?
+		lava-server manage devices add --device-type $devicetype --worker $worker $devicename || exit $?
+	done
+done
-- 
cgit 1.2.3-korg