From dc8e226f947ba9705d595af4346537d72344c0c9 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 6 Nov 2023 14:23:07 -0700 Subject: [PATCH] (role/puppetdb) drop support for EL7 & EL8 --- .../role/puppetdb/osfamily/RedHat/major/7.yaml | 18 ------------------ .../role/puppetdb/osfamily/RedHat/major/8.yaml | 6 ------ spec/hosts/roles/puppetdb_spec.rb | 2 ++ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 hieradata/role/puppetdb/osfamily/RedHat/major/7.yaml delete mode 100644 hieradata/role/puppetdb/osfamily/RedHat/major/8.yaml diff --git a/hieradata/role/puppetdb/osfamily/RedHat/major/7.yaml b/hieradata/role/puppetdb/osfamily/RedHat/major/7.yaml deleted file mode 100644 index fe168b32a5..0000000000 --- a/hieradata/role/puppetdb/osfamily/RedHat/major/7.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -packages: - - "rh-postgresql12-syspaths" -postgresql::client::package_name: "rh-postgresql12-syspaths" # appears to be ignored -# puppetdb::globals is declared by puppetdb::database::postgresql -postgresql::globals::bindir: "/usr/bin" -postgresql::globals::client_package_name: "rh-postgresql12-syspaths" # appears to be ignored -postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data" -postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths" -postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data" -postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths" -postgresql::globals::service_name: "postgresql" -postgresql::globals::version: "12" -profile::core::yum::versionlock: - puppetdb: - ensure: "present" - version: "%{lookup('puppetdb::globals::version')}" - release: "1.el7" diff --git a/hieradata/role/puppetdb/osfamily/RedHat/major/8.yaml b/hieradata/role/puppetdb/osfamily/RedHat/major/8.yaml deleted file mode 100644 index 16bc0ba304..0000000000 --- a/hieradata/role/puppetdb/osfamily/RedHat/major/8.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -profile::core::yum::versionlock: - puppetdb: - ensure: "present" - version: "%{lookup('puppetdb::globals::version')}" - release: "1.el8" diff --git a/spec/hosts/roles/puppetdb_spec.rb b/spec/hosts/roles/puppetdb_spec.rb index 6baeed6cd8..b7094c24ac 100644 --- a/spec/hosts/roles/puppetdb_spec.rb +++ b/spec/hosts/roles/puppetdb_spec.rb @@ -13,6 +13,8 @@ describe "#{role} role" do on_supported_os.each do |os, facts| + next unless os =~ %r{almalinux-9-x86_64} + context "on #{os}" do let(:facts) { facts } let(:node_params) do