patch.sh: Exit on patch apply failure

Patches that fail to apply are silently skipped. Since retrying is
not possible, deploy moves on, making the problem hard to observe.

Change-Id: I3fe01cef6b245de53767a660b9b4fdfae0d5d0ff
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit bd0259e7bb5f045a1ba7958d79039848d062aad1)

diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index 6cd65fd..b56ebb8 100755 (executable)
--- a/mcp/patches/patch.sh
+++ b/mcp/patches/patch.sh
@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 if [ -r "$1" ]; then
   while IFS=': ' read -r p_dest p_file; do
-    [[ "${p_dest}" =~ $2 ]] && \
+    if [[ "${p_dest}" =~ $2 ]]; then
       patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
+    fi
   done < "$1"
 fi

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index b0a2687..73190e3 100755 (executable)
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -28,8 +28,9 @@ fi
 
 # ssh to cfg01
 # shellcheck disable=SC2086,2087
-ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
+ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   sudo -i
+  set -e
 
   echo -n 'Checking out cloud-init has finished running ...'
   while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done