File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed
Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -547,10 +547,10 @@ def enable_https_apt_sources(host)
547547 end
548548
549549 def postgres_manifest
550- # bionic is EOL, so its pgdg repo has been removed.
550+ # bionic and buster are EOL, so the pgdg repos were removed.
551551 # For RedHat, the versions of the module that support upgrade_oldest
552552 # tests from Puppet 6 configure the wrong GPG key
553- manage_package_repo = ! ( is_bionic || is_el )
553+ manage_package_repo = ! ( is_bionic || is_buster || is_el )
554554
555555 manifest = <<-EOS
556556 # create the puppetdb database
Original file line number Diff line number Diff line change 2525 step "Install PostgreSQL el8 repo" do
2626 on master , "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
2727 end
28+ # these OSes are EOL, so get postgresql from the archive
2829 elsif is_bionic
29- # bionic is EOL, so get postgresql from the archive
3030 on master , 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main" >> /etc/apt/sources.list'
3131 on master , 'curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -'
3232 on master , 'apt update'
33+ elsif is_buster
34+ on master , 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list'
35+ on master , 'curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -'
36+ on master , 'apt update'
3337 end
3438end
You can’t perform that action at this time.
0 commit comments