X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5fe15b9011228668b4b95f2416a87c376479822a..2efd88cf64130bb0ebb0549d30053b85baaae2f9:/tools/salt-install/installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 1bcfa14505..79c85c89c1 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -10,7 +10,7 @@ declare -A NODES
 
 sync() {
     if [[ "$NODE" != localhost ]] ; then
-	if ! ssh $NODE test -d ${TARGET}.git ; then
+	if ! ssh $NODE test -d ${GITTARGET}.git ; then
 	    ssh $NODE git init --bare ${GITTARGET}.git
 	    if ! git remote add $NODE $DEPLOY_USER@$NODE:${GITTARGET}.git ; then
 		git remote set-url $NODE $DEPLOY_USER@$NODE:${GITTARGET}.git
@@ -40,6 +40,7 @@ deploynode() {
 
 loadconfig() {
     CONFIG_FILE=local.params
+    CONFIG_DIR=local_config_dir
     if [[ ! -s $CONFIG_FILE ]] ; then
 	echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi
@@ -102,10 +103,16 @@ case "$subcmd" in
 
 	loadconfig
 
-	set -x
+	if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then
+	    echo
+	    echo "Some parameters still need to be updated.  Please fix them and then re-run deploy."
+	    exit 1
+	fi
 
 	BRANCH=$(git branch --show-current)
 
+	set -x
+
 	git add -A
 	if ! git diff --cached --exit-code ; then
 	    git commit -m"prepare for deploy"