From 1e4e6159a72f4be17eefaa930bd2a8dfb4399bd7 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 5 Aug 2025 18:50:45 -0300 Subject: [PATCH] 23010: Uses new pg-formula supporting Ubuntu 24.04 Also, avoid installing postgresql-contrib as it depends on the currently supported PG version on each distro, eg: install postgresql-16 on Ubuntu 24.04 so both v15 and v16 get installed (because v15 is the one requested by the installer) and that creates issues with service ports. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../config_examples/multi_host/aws/pillars/postgresql.sls | 2 -- .../single_host/multiple_hostnames/pillars/postgresql.sls | 2 -- .../single_host/single_hostname/pillars/postgresql.sls | 2 -- tools/salt-install/provision.sh | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls index bb48450a1b..f114d4eb10 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls @@ -10,8 +10,6 @@ ### POSTGRESQL postgres: - pkgs_extra: - - postgresql-contrib use_upstream_repo: true version: {{ pg_version }} postgresconf: |- diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls index ade544764a..a34f9d07e9 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls @@ -6,8 +6,6 @@ ### POSTGRESQL postgres: use_upstream_repo: false - pkgs_extra: - - postgresql-contrib postgresconf: |- listen_addresses = '*' # listen on all interfaces #ssl = on diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls index 82a4f7120a..b68c13cf25 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls @@ -6,8 +6,6 @@ ### POSTGRESQL postgres: use_upstream_repo: false - pkgs_extra: - - postgresql-contrib postgresconf: |- listen_addresses = '*' # listen on all interfaces # If you want to enable communications' encryption to the DB server, diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index ad19896f31..5dd34bc686 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -288,7 +288,7 @@ SALT_VERSION="3006" # Other formula versions we depend on ARVADOS_TAG="453c263c1424294d24a937e700357d479d49126b" -POSTGRES_TAG="38e6690501159d969bd2ef79f56820aaa6bc2a21" +POSTGRES_TAG="a7c48f5ca0b6c90feb4b24a3106e79ee2ce9baed" POSTGRES_URL="https://github.com/arvados/postgres-formula.git" NGINX_TAG="v2.8.1" DOCKER_TAG="v2.4.2" -- 2.39.5