18870: Fix remote add

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

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 7bd789f6890af0d8915992dc69c0c4e90e95e252..4d601d9bf906b16d9a954cd9eccf86f1533c7084 100755 (executable)
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -64,20 +64,25 @@ case "$subcmd" in
 
        source ${CONFIG_FILE}
 
 
        source ${CONFIG_FILE}
 

+       git add -A

        git commit -m"prepare for deploy"
        for NODE in "${!NODES[@]}"
        do
        git commit -m"prepare for deploy"
        for NODE in "${!NODES[@]}"
        do

-           if ! ssh $NODE test -d arvados-setup.git ; then
-               ssh $NODE git init --bare arvados-setup.git
-               git add remote $NODE $DEPLOY_USER@$NODE:arvados-setup.git
-               git push $NODE
-               ssh $NODE git clone arvados-setup.git arvados-setup
+           if test $NODE = localhost ; then
+               sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}
+           else
+               if ! ssh $NODE test -d arvados-setup.git ; then
+                   ssh $NODE git init --bare arvados-setup.git
+                   git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git
+                   git push $NODE
+                   ssh $NODE git clone arvados-setup.git arvados-setup
+               fi
+
+               git push $NODE master
+               ssh $NODE git -C arvados-setup pull
+
+               ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"

            fi
            fi

-
-           git push $NODE master
-           ssh $NODE git -C arvados-setup pull
-
-           ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"

        done
        ;;
     *)
        done
        ;;
     *)