Merge branch '21086-cert-source'

[arvados.git] / tools / salt-install / common.sh

diff --git a/tools/salt-install/common.sh b/tools/salt-install/common.sh
index 215fb50ecb4653dc740cd9446c041a64a98979fc..5d9dba14cdf2bd9585b712c2c028ffbe09de84c9 100644 (file)
--- 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