From 595582e54298f7f5be2189f01b0084a1764a7a42 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Tue, 29 Apr 2025 20:55:25 +1000 Subject: [PATCH] feat: update psql15 repos for roles - update patroni to use packagerepo - update puppetdb to use packagerepo --- hieradata/roles/infra/puppetdb/sql.yaml | 8 ++++---- hieradata/roles/infra/sql/patroni.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hieradata/roles/infra/puppetdb/sql.yaml b/hieradata/roles/infra/puppetdb/sql.yaml index 838300d..baae548 100644 --- a/hieradata/roles/infra/puppetdb/sql.yaml +++ b/hieradata/roles/infra/puppetdb/sql.yaml @@ -29,11 +29,11 @@ profiles::yum::global::repos: name: postgresql-15 descr: postgresql-15 repository target: /etc/yum.repos.d/postgresql.repo - baseurl: https://edgecache.query.consul/postgres/yum/15/redhat/rhel-%{facts.os.release.full}-%{facts.os.architecture} - gpgkey: https://edgecache.query.consul/postgres/yum/keys/PGDG-RPM-GPG-KEY-RHEL + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL postgresql-common: name: postgresql-common descr: postgresql-common repository target: /etc/yum.repos.d/postgresql.repo - baseurl: https://edgecache.query.consul/postgres/yum/common/redhat/rhel-%{facts.os.release.full}-%{facts.os.architecture} - gpgkey: https://edgecache.query.consul/postgres/yum/keys/PGDG-RPM-GPG-KEY-RHEL + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL diff --git a/hieradata/roles/infra/sql/patroni.yaml b/hieradata/roles/infra/sql/patroni.yaml index f925067..f962a62 100644 --- a/hieradata/roles/infra/sql/patroni.yaml +++ b/hieradata/roles/infra/sql/patroni.yaml @@ -4,14 +4,14 @@ profiles::yum::global::repos: name: postgresql-15 descr: postgresql-15 repository target: /etc/yum.repos.d/postgresql.repo - baseurl: https://edgecache.query.consul/postgres/yum/15/redhat/rhel-%{facts.os.release.full}-%{facts.os.architecture} - gpgkey: https://edgecache.query.consul/postgres/yum/keys/PGDG-RPM-GPG-KEY-RHEL + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL postgresql-common: name: postgresql-common descr: postgresql-common repository target: /etc/yum.repos.d/postgresql.repo - baseurl: https://edgecache.query.consul/postgres/yum/common/redhat/rhel-%{facts.os.release.full}-%{facts.os.architecture} - gpgkey: https://edgecache.query.consul/postgres/yum/keys/PGDG-RPM-GPG-KEY-RHEL + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL profiles::sql::patroni::cluster_name: "patroni-%{facts.environment}" profiles::sql::patroni::postgres_exporter_enabled: true