fix test of $MASTER_HOSTNAME to prevent from exit from bash
diff --git a/salt-master-init.sh b/salt-master-init.sh
index 343324c..d18c2fe 100755
--- a/salt-master-init.sh
+++ b/salt-master-init.sh
@@ -101,7 +101,7 @@
saltmaster_bootstrap() {
log_info "Salt master, minion setup (salt-master-setup.sh)"
- test -n "$MASTER_HOSTNAME" || exit 1
+ test -n "$MASTER_HOSTNAME" || echo "missing \$MASTER_HOSTNAME" && break
pgrep salt-master | sed /$$/d | xargs --no-run-if-empty -i{} $SUDO kill -9 {}
pkill -9 salt-minion
@@ -142,7 +142,7 @@
saltmaster_init() {
log_info "Runing saltmaster states"
- test -n "$MASTER_HOSTNAME" || exit 1
+ test -n "$MASTER_HOSTNAME" || echo "missing \$MASTER_HOSTNAME" && break
set -e
$SUDO salt-call saltutil.sync_all >/dev/null
@@ -210,7 +210,7 @@
set -e
log_info "Verify Salt master"
- test -n "$MASTER_HOSTNAME" || exit 1
+ test -n "$MASTER_HOSTNAME" || echo "missing \$MASTER_HOSTNAME" && break
if [[ $VERIFY_SALT_CALL =~ ^(True|true|1|yes)$ ]]; then
$SUDO salt-call ${SALT_OPTS} --id=${MASTER_HOSTNAME} grains.item roles > /tmp/${MASTER_HOSTNAME}.grains.item.roles