projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18785: fix self-signed single host installation.
[arvados.git]
/
tools
/
salt-install
/
provision.sh
diff --git
a/tools/salt-install/provision.sh
b/tools/salt-install/provision.sh
index fd88d97a9484e1712d824a91211623ee38198a66..8bca9d0bd536309ac3dbe021044ad03c4aab935e 100755
(executable)
--- a/
tools/salt-install/provision.sh
+++ b/
tools/salt-install/provision.sh
@@
-587,7
+587,7
@@
if [ -z "${ROLES}" ]; then
CERT_NAME=${c}
fi
CERT_NAME=${c}
fi
- if [[ "$
{SSL_MODE}" = "bring-your-own" || "${SSL_MODE}" == "self-signed
" ]]; then
+ if [[ "$
SSL_MODE" == "bring-your-own
" ]]; then
copy_custom_cert ${CUSTOM_CERTS_DIR} ${CERT_NAME}
fi
copy_custom_cert ${CUSTOM_CERTS_DIR} ${CERT_NAME}
fi
@@
-775,6
+775,10
@@
echo '\pset pager off' >> /root/.psqlrc
# Now run the install
salt-call --local state.apply -l ${LOG_LEVEL}
# Now run the install
salt-call --local state.apply -l ${LOG_LEVEL}
+# Finally, make sure that /etc/hosts is not overwritten on reboot
+# TODO: will this work on CentOS?
+sed -i 's/^manage_etc_hosts: true/#manage_etc_hosts: true/g' /etc/cloud/cloud.cfg.d/*
+
# FIXME! #16992 Temporary fix for psql call in arvados-api-server
if [ "x${DELETE_PSQL}" = "xyes" ]; then
echo "Removing .psql file"
# FIXME! #16992 Temporary fix for psql call in arvados-api-server
if [ "x${DELETE_PSQL}" = "xyes" ]; then
echo "Removing .psql file"