[arvados] updated: 2.1.0-2943-g1c064386f

[git repository hosting]

Summary of changes:
 doc/_includes/_download_installer.liquid |  7 +++++--
 tools/salt-install/installer.sh          | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

       via  1c064386fd4ae04f349ca629beb13aa10a4d421b (commit)
      from  8ed7c88997b2f9fb66e3779b0d53cccc918e5ff0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1c064386fd4ae04f349ca629beb13aa10a4d421b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 30 16:20:57 2022 -0400

    19215: Check for git and ip tools
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/_includes/_download_installer.liquid b/doc/_includes/_download_installer.liquid
index 280308beb..d8b6fe0d3 100644
--- a/doc/_includes/_download_installer.liquid
+++ b/doc/_includes/_download_installer.liquid
@@ -20,9 +20,12 @@ The @install.sh@ and @provision.sh@ scripts will help you deploy Arvados by prep
 
 h2(#copy_config). Initialize the installer
 
+Replace "xarv1" with the cluster id you selected earlier.
+
 <notextile>
-<pre><code>./installer.sh initialize ~/setup-arvados-xarv1 {{local_params_src}} {{config_examples_src}}
-cd ~/setup-arvados-xarv1
+<pre><code>CLUSTER=xarv1
+./installer.sh initialize ~/setup-arvados-${CLUSTER} {{local_params_src}} {{config_examples_src}}
+cd ~/setup-arvados-${CLUSTER}
 </code></pre>
 </notextile>
 
diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 2b576893a..ea79cfd66 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -42,6 +42,19 @@ declare DEPLOY_USER
 # This will be populated by loadconfig()
 declare GITTARGET
 
+checktools() {
+    MISSING=''
+    for a in git ip ; do
+	if ! which $a ; then
+	    MISSING="$MISSING $a"
+	fi
+    done
+    if [[ -n "$MISSING" ]] ; then
+	echo "Some tools are missing, please make sure you have the 'git' and 'iproute2' packages installed"
+	exit 1
+    fi
+}
+
 sync() {
     local NODE=$1
     local BRANCH=$2
@@ -122,6 +135,8 @@ case "$subcmd" in
 	    exit
 	fi
 
+	checktools
+
 	set +u
 	SETUPDIR=$1
 	PARAMS=$2
@@ -170,6 +185,8 @@ case "$subcmd" in
 	NODE=$1
 	set -u
 
+	checktools
+
 	loadconfig
 
 	if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then

-----------------------------------------------------------------------


hooks/post-receive
--