commit 23bb62c6263b76cd0db370474db7b28ed0e74495
author Petr Michalec <epcim@apealive.net> Thu Nov 30 15:05:02 2017 +0100
committer Petr Michalec <epcim@apealive.net> Thu Nov 30 15:05:02 2017 +0100
tree 28a74284d3cd8b6e1e4e7393a22d277f49f5685a
parent fcfce99cacb96c96730f8175e1e07994bfd0e768

fix, wrong appostrophes on env. var.

Change-Id: I2f05603d801a2a7f13c7f7d1e57efc5750a504ae

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index d549a64..a99d66e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -628,8 +628,8 @@
     PILLAR='{'${SALT_MASTER_PILLAR}' "reclass":{"storage":{"data_source":{"engine":"local"}}} }'
 
     log_info "State: salt.master.env,salt.master.pillar"
-    if ! retry ${SALT_STATE_RETRY} $SUDO salt-call ${SALT_OPTS} state.apply salt.master.env,salt.master.pillar pillar=\'${PILLAR}\'; then
-      log_err "State `salt.master.env,salt.master.pillar pillar=\'${PILLAR}\'` failed, keep your eyes wide open!"
+    if ! retry ${SALT_STATE_RETRY} $SUDO salt-call ${SALT_OPTS} state.apply salt.master.env,salt.master.pillar pillar=${PILLAR}; then
+      log_err "State `salt.master.env,salt.master.pillar pillar=${PILLAR}` failed, keep your eyes wide open!"
     fi
 
     # Revert temporary SaltMaster minimal configuration, if any
@@ -642,8 +642,8 @@
       git checkout -- $RECLASS_ROOT/nodes || true
       log_info "Re-Run states: salt.master.env and salt.master.pillar according the HEAD state."
       log_info "State: salt.master.env,salt.master.pillar"
-      if ! retry ${SALT_STATE_RETRY} $SUDO salt-call ${SALT_OPTS} state.apply salt.master.env,salt.master.pillar pillar=\'${PILLAR}\'; then
-        log_err "State `salt.master.env,salt.master.pillar pillar=\'${PILLAR}\'` failed, keep your eyes wide open."
+      if ! retry ${SALT_STATE_RETRY} $SUDO salt-call ${SALT_OPTS} state.apply salt.master.env,salt.master.pillar pillar=${PILLAR}; then
+        log_err "State `salt.master.env,salt.master.pillar pillar=${PILLAR}` failed, keep your eyes wide open."
       fi
     fi
     popd