X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/722fbc71928e7fc6b91eb101788b51c2bb9577eb..c47e500a8143b1354624a962eae7f8fc016ba72f:/tools/salt-install/installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 7bd789f689..2024c2cd1d 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -6,6 +6,27 @@
 
 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]}"
+	    fi
+}
+
 subcmd="$1"
 if test -n "$subcmd" ; then
     shift
@@ -57,6 +78,7 @@ case "$subcmd" in
 	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,21 +86,23 @@ case "$subcmd" in
 
 	source ${CONFIG_FILE}
 
-	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
-	    fi
+	set -x
 
-	    git push $NODE master
-	    ssh $NODE git -C arvados-setup pull
+	BRANCH=$(git branch --show-current)
 
-	    ssh $DEPLOY_USER@$NODE "cd arvados-setup && sudo ./provision.sh --config local.params --roles ${NODES[$NODE]}"
-	done
+	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
+		deploynode
+	    done
+	else
+	    deploynode
+	fi
 	;;
     *)
 	echo "Arvados installer"