From 067a27dd178d6b8d1d4f077070f74ca5d2d07fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Mon, 21 Dec 2020 01:20:42 +0100
Subject: [PATCH] Hadoop image: fix setup script

---
 image/scripts/hadoop-single-setup.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/image/scripts/hadoop-single-setup.sh b/image/scripts/hadoop-single-setup.sh
index b9be44a..a3458e8 100755
--- a/image/scripts/hadoop-single-setup.sh
+++ b/image/scripts/hadoop-single-setup.sh
@@ -4,6 +4,12 @@ if ! hostname || ! hostname -f || ! ping -c1 `hostname` >/dev/null || ! ping -c1
 	/usr/local/bin/fix-hostname.sh master hadoop
 fi
 
-mkdir /data
-puppet apply --test /root/single.pp \
-	&& puppet apply --test /root/single2.pp
+mkdir /data 2>/dev/null || :
+
+puppet apply --test /root/single.pp
+if test $? = 0 -o $? = 2; then
+	puppet apply --test /root/single2.pp
+else
+	echo "First stage setup failed"
+	exit $?
+fi
-- 
GitLab