commit 37ba6f35af2619488304ae968550d1955c3e67d3
author Petr Michalec <epcim@apealive.net> Thu Nov 30 15:53:03 2017 +0100
committer Petr Michalec <epcim@apealive.net> Thu Nov 30 15:53:03 2017 +0100
tree ff06304caf95a79c692e6aea1f1e4ac8f9c90c55
parent 8ce8a6516b5cb16788e879a0e64d51e948d63d8f

fix, wrong appostrophes on env. var.

Change-Id: Ib616400bae0bfb92c86ae1cb9fd1098fa9de2a94

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 227aa56..c71bb61 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -628,7 +628,7 @@
     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
+    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
 
@@ -642,7 +642,7 @@
       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
+      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