projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18870: Run diagnostics
[arvados.git]
/
tools
/
salt-install
/
installer.sh
diff --git
a/tools/salt-install/installer.sh
b/tools/salt-install/installer.sh
index 90584b36fc2cafe32273035edac3ea5112e1ae6f..f4934aa2f86fdaae02eda51b4095d0f65500331e 100755
(executable)
--- 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
git push $NODE $BRANCH
ssh $NODE git -C arvados-setup checkout $BRANCH
ssh $NODE git -C arvados-setup pull
+ fi
}
deploynode() {
}
deploynode() {
@@
-35,6
+36,14
@@
deploynode() {
fi
}
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
subcmd="$1"
if test -n "$subcmd" ; then
shift
@@
-87,12
+96,8
@@
case "$subcmd" in
;;
deploy)
NODE=$1
;;
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
set -x
@@
-113,7
+118,19
@@
case "$subcmd" in
sync
deploynode
fi
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 ""
*)
echo "Arvados installer"
echo ""