From e39adbe28e6ada009b086a53bc9e4187b824fd0d Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Sun, 26 Jun 2022 22:33:27 -0400
Subject: [PATCH] 18870: Run diagnostics

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 tools/salt-install/installer.sh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 12efc3eab4..f4934aa2f8 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -36,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
@@ -88,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
 
@@ -114,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 ""
-- 
2.30.2