projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19164: add a few flags to the compute image builder script.
[arvados.git]
/
tools
/
salt-install
/
provision.sh
diff --git
a/tools/salt-install/provision.sh
b/tools/salt-install/provision.sh
index 53b67c6cd86111eb70ac385f9548f8ab9ac943f1..8cb87203fe6d4fc35b9a931725abed504ce4bfe7 100755
(executable)
--- a/
tools/salt-install/provision.sh
+++ b/
tools/salt-install/provision.sh
@@
-197,8
+197,8
@@
CUSTOM_CERTS_DIR="${SCRIPT_DIR}/certs"
# release.
# The "local.params.example.*" files already set "RELEASE=production"
# to deploy production-ready packages
# release.
# The "local.params.example.*" files already set "RELEASE=production"
# to deploy production-ready packages
-RELEASE="
development
"
-VERSION="
latest
"
+RELEASE="
production
"
+VERSION="
2.4.0
"
# These are arvados-formula-related parameters
# An arvados-formula tag. For a stable release, this should be a
# These are arvados-formula-related parameters
# An arvados-formula tag. For a stable release, this should be a
@@
-518,7
+518,7
@@
if [ -d "${F_DIR}"/extra/extra ]; then
# Same when using self-signed certificates.
SKIP_SNAKE_OIL="dont_add_snakeoil_certs"
fi
# Same when using self-signed certificates.
SKIP_SNAKE_OIL="dont_add_snakeoil_certs"
fi
- for f in $(ls "${F_DIR}"/extra/extra/*.sls |
grep -v ${SKIP_SNAKE_OIL}
); do
+ for f in $(ls "${F_DIR}"/extra/extra/*.sls |
egrep -v "${SKIP_SNAKE_OIL}|shell_"
); do
echo " - extra.$(basename ${f} | sed 's/.sls$//g')" >> ${S_DIR}/top.sls
done
# Use byo or self-signed certificates
echo " - extra.$(basename ${f} | sed 's/.sls$//g')" >> ${S_DIR}/top.sls
done
# Use byo or self-signed certificates
@@
-551,6
+551,8
@@
if [ -z "${ROLES}" ]; then
echo " - postgres" >> ${S_DIR}/top.sls
echo " - docker.software" >> ${S_DIR}/top.sls
echo " - arvados" >> ${S_DIR}/top.sls
echo " - postgres" >> ${S_DIR}/top.sls
echo " - docker.software" >> ${S_DIR}/top.sls
echo " - arvados" >> ${S_DIR}/top.sls
+ echo " - extra.shell_sudo_passwordless" >> ${S_DIR}/top.sls
+ echo " - extra.shell_cron_add_login_sync" >> ${S_DIR}/top.sls
# Pillars
echo " - docker" >> ${P_DIR}/top.sls
# Pillars
echo " - docker" >> ${P_DIR}/top.sls
@@
-757,6
+759,8
@@
else
;;
"shell")
# States
;;
"shell")
# States
+ echo " - extra.shell_sudo_passwordless" >> ${S_DIR}/top.sls
+ echo " - extra.shell_cron_add_login_sync" >> ${S_DIR}/top.sls
grep -q "docker" ${S_DIR}/top.sls || echo " - docker.software" >> ${S_DIR}/top.sls
grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls
# Pillars
grep -q "docker" ${S_DIR}/top.sls || echo " - docker.software" >> ${S_DIR}/top.sls
grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls
# Pillars