commit 3256341f812589d2f6ae8afc221c3cbeff3c15ce
author Jakub Josef <jakub.josef@gmail.com> Wed Jan 17 17:55:05 2018 +0100
committer Jakub Josef <jakub.josef@gmail.com> Wed Jan 17 17:55:05 2018 +0100
tree de5a493951f5b82eaadd8d3389fe4081cf15017f
parent 0b6117498e4108508ae1c2bb28c777b9c1cc9bd7

Ensure salt-master service is running before calling salt.master.service state

Change-Id: Ie0c1f49cfe10a09d2f32da5bba5d7be51e47737c

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0b1cf68..f35689a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -667,6 +667,8 @@
 
     # finally re-configure salt master conf, ie: may remove ignore_class_notfound option
     log_info "State: salt.master.service"
+    # ensure salt master is started
+    saltservice_start
     retry ${SALT_STATE_RETRY} $SUDO salt-call ${SALT_OPTS} state.apply salt.master.service || true
     saltservice_start