18870: another fix

[arvados.git] / tools / salt-install / installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 2024c2cd1d3c81b5d247cefda4315e6f389390fc..12efc3eab430dd9758dd5def2e119b50d3e84b52 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -6,25 +6,34 @@
 
 set -e
 
-deploynode() {
-           if test $NODE = localhost ; then
-               sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}
-           else
-               if ! ssh $NODE test -d arvados-setup ; then
-                   ssh $NODE git init --bare arvados-setup.git
-                   if ! git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git ; then
-                       git remote set-url $NODE $DEPLOY_USER@$NODE:arvados-setup.git
-                   fi
-                   git push $NODE $BRANCH
-                   ssh $NODE git clone arvados-setup.git arvados-setup
-               fi
-
-               git push $NODE $BRANCH
-               ssh $NODE git -C arvados-setup checkout $BRANCH
-               ssh $NODE git -C arvados-setup pull
-
-               ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"
+sync() {
+    if test "$NODE" != localhost ; then
+       if ! ssh $NODE test -d arvados-setup ; then
+           ssh $NODE git init --bare arvados-setup.git
+           if ! git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git ; then
+               git remote set-url $NODE $DEPLOY_USER@$NODE:arvados-setup.git
            fi
+           git push $NODE $BRANCH
+           ssh $NODE git clone arvados-setup.git arvados-setup
+       fi
+
+       git push $NODE $BRANCH
+       ssh $NODE git -C arvados-setup checkout $BRANCH
+       ssh $NODE git -C arvados-setup pull
+    fi
+}
+
+deploynode() {
+    if test -z "${NODES[$NODE]}" ; then
+       echo "No roles declared for '$NODE' in local.params"
+       exit 1
+    fi
+
+    if test $NODE = localhost ; then
+       sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}
+    else
+       ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"
+    fi
 }
 
 subcmd="$1"
@@ -76,7 +85,7 @@ case "$subcmd" in
        git commit -m"initial commit"
 
        echo "setup directory initialized, now go to $SETUPDIR, edit 'local.params' and 'local_config_dir' as needed, then run 'installer.sh deploy'"
-    ;;
+       ;;
     deploy)
        NODE=$1
        CONFIG_FILE=local.params
@@ -98,9 +107,11 @@ case "$subcmd" in
        if test -z "$NODE"; then
            for NODE in "${!NODES[@]}"
            do
+               sync
                deploynode
            done
        else
+           sync
            deploynode
        fi
        ;;