Merge pull request #219 from contiv/master

Merging changes for 1.1.0 release
contiv · Jul 18, 2017 · 9e8b4fe · 9e8b4fe
2 parents 6c66676 + d95ef70
commit 9e8b4fe
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/install/k8s/install.sh b/install/k8s/install.sh
@@ -112,7 +112,7 @@ function copy_unless_identical_paths() {
 
 error_ret() {
 	echo ""
-	echo "$1"
+	echo "$*"
 	exit 1
 }
 
@@ -293,6 +293,9 @@ for i in {0..150}; do
 	netctl tenant ls >/dev/null 2>&1 || continue
 	break
 done
+
+[[ $i -ge 150 ]] && error_ret "contiv pods are not ready !!"
+
 set -e
 
 if [ "$fwd_mode" == "routing" ]; then