X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3a7b7f2254e57dc8f273cc468ec9622b759905bd..e39adbe28e6ada009b086a53bc9e4187b824fd0d:/tools/salt-install/installer.sh

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 90584b36fc..f4934aa2f8 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -20,6 +20,7 @@ sync() {
 	git push $NODE $BRANCH
 	ssh $NODE git -C arvados-setup checkout $BRANCH
 	ssh $NODE git -C arvados-setup pull
+    fi
 }
 
 deploynode() {
@@ -35,6 +36,14 @@ deploynode() {
     fi
 }
 
+loadconfig() {
+    CONFIG_FILE=local.params
+    if ! test -s $CONFIG_FILE ; then
+	echo "Must be run from arvados-setup, maybe you need to 'initialize' first?"
+    fi
+    source ${CONFIG_FILE}
+}
+
 subcmd="$1"
 if test -n "$subcmd" ; then
     shift
@@ -87,12 +96,8 @@ case "$subcmd" in
 	;;
     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?"
-	fi
 
-	source ${CONFIG_FILE}
+	loadconfig
 
 	set -x
 
@@ -113,7 +118,19 @@ case "$subcmd" in
 	    sync
 	    deploynode
 	fi
+
 	;;
+    diagnostics)
+	loadconfig
+
+	if ! which arvados-client ; then
+	    apt-get install arvados-client
+	fi
+
+	export ARVADOS_API_HOST="${CONTROLLER_INT_IP}"
+	export ARVADOS_API_TOKEN="$SYSTEM_ROOT_TOKEN"
+
+	arvados-client diagnostics -internal-client
     *)
 	echo "Arvados installer"
 	echo ""