X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/623bd0b69f9ad3fe3889acc463955630946275d2..e59273e06c41fa1532ab887f62695a2bd6d0e284:/tools/salt-install/installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index d9666cbc04..6fdd0320fe 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -6,6 +6,37 @@
 
 set -e
 
+sync() {
+    if test $NODE = localhost ; then
+	# nothing to do
+    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
+}
+
+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"
 if test -n "$subcmd" ; then
     shift
@@ -55,8 +86,9 @@ 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
 	if ! test -s $CONFIG_FILE ; then
 	    echo "Must be run from arvados-setup, maybe you need to 'initialize' first?"
@@ -64,25 +96,25 @@ case "$subcmd" in
 
 	source ${CONFIG_FILE}
 
-	git commit -m"prepare for deploy"
-	for NODE in "${!NODES[@]}"
-	do
-	    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 add remote $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
-	done
+	set -x
+
+	BRANCH=$(git branch --show-current)
+
+	git add -A
+	if ! git diff --cached --exit-code ; then
+	    git commit -m"prepare for deploy"
+	fi
+
+	if test -z "$NODE"; then
+	    for NODE in "${!NODES[@]}"
+	    do
+		sync
+		deploynode
+	    done
+	else
+	    sync
+	    deploynode
+	fi
 	;;
     *)
 	echo "Arvados installer"