aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 01:16:54 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-13 22:39:27 +0200
commitbd0259e7bb5f045a1ba7958d79039848d062aad1 (patch)
treeb39c1d19f5b66c94721e21b116aac6daee29f049
parent3479e81a8bfa1ae15084100f2b3872ca8f1ed752 (diff)
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>
-rwxr-xr-xmcp/patches/patch.sh5
-rwxr-xr-xmcp/scripts/salt.sh3
2 files changed, 5 insertions, 3 deletions
diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index 6cd65fd10..b56ebb815 100755
--- 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 b0a26873d..73190e315 100755
--- 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