X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c32f2129960b060195b773f19d8582f1c693953d..6bed090af13bba56d6cfe5f5a96add95000fa87c:/tools/salt-install/common.sh diff --git a/tools/salt-install/common.sh b/tools/salt-install/common.sh index 215fb50ecb..5d9dba14cd 100644 --- a/tools/salt-install/common.sh +++ b/tools/salt-install/common.sh @@ -17,6 +17,8 @@ else fi USE_SSH_JUMPHOST=${USE_SSH_JUMPHOST:-} +DISABLED_CONTROLLER="" +DATABASE_POSTGRESQL_DEFAULT_VERSION=15 # Comma-separated list of nodes. This is used to dynamically adjust # salt pillars. @@ -52,3 +54,8 @@ if [ -z "${ROLE2NODES['balancer']:-}" ]; then else ENABLE_BALANCER="yes" fi + +# Auto-sets PG version if needed +if [[ -n "${ROLE2NODES['database']:-}" || "${NODELIST}" == "localhost" ]]; then + DATABASE_POSTGRESQL_VERSION="${DATABASE_POSTGRESQL_VERSION:-${DATABASE_POSTGRESQL_DEFAULT_VERSION}}" +fi \ No newline at end of file