X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e805640e7904dc282f00be82a2edb53d496a87bb..6bed090af13bba56d6cfe5f5a96add95000fa87c:/tools/salt-install/common.sh?ds=sidebyside

diff --git a/tools/salt-install/common.sh b/tools/salt-install/common.sh
index d406f2ff60..5d9dba14cd 100644
--- a/tools/salt-install/common.sh
+++ b/tools/salt-install/common.sh
@@ -16,6 +16,10 @@ else
   exit 1
 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.
 NODELIST=""
@@ -29,7 +33,6 @@ done
 
 # The mapping of roles to nodes. This is used to dynamically adjust
 # salt pillars.
-declare -A ROLE2NODES
 for node in "${!NODES[@]}"; do
   roles="${NODES[$node]}"
 
@@ -51,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