X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/50596eecb2db1f6a08997dff744c5d65ebdd2987..7f8fa5edc5175ffda9fdfaa28081f799ae485ec0:/tools/salt-install/provision.sh diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index cceedba259..edecc761c8 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -23,7 +23,8 @@ usage() { echo >&2 "${0} options:" echo >&2 " -d, --debug Run salt installation in debug mode" echo >&2 " -c , --config Path to the local.params config file" - echo >&2 " -t, --test Test installation running a CWL workflow" + echo >&2 " -t, --test Test cluster by running \`arvados-client diagnostics\`" + echo >&2 " and a simple workflow" echo >&2 " -r, --roles List of Arvados roles to apply to the host, comma separated" echo >&2 " Possible values are:" echo >&2 " balancer" @@ -360,23 +361,24 @@ fi if [ "${DUMP_CONFIG}" = "yes" ]; then echo "The provision installer will just dump a config under ${DUMP_SALT_CONFIG_DIR} and exit" else - # Install a few dependency packages - # First, let's figure out the OS we're working on OS_IDS="$(. /etc/os-release && echo "${ID:-} ${ID_LIKE:-}")" echo "Detected distro families: $OS_IDS" + # Several of our formulas use the cron module, which requires the crontab + # command. We install systemd-cron to ensure we have that. + # The rest of these packages are required by the rest of the script. for OS_ID in $OS_IDS; do case "$OS_ID" in rhel) echo "WARNING! Disabling SELinux, see https://dev.arvados.org/issues/18019" sed -i 's/SELINUX=enforcing/SELINUX=permissive/g' /etc/sysconfig/selinux setenforce permissive - yum install -y curl git jq + yum install -y curl git jq systemd-cron break ;; debian) DEBIAN_FRONTEND=noninteractive apt -o DPkg::Lock::Timeout=120 update - DEBIAN_FRONTEND=noninteractive apt install -y curl git jq + DEBIAN_FRONTEND=noninteractive apt install -y curl git jq systemd-cron break ;; esac