From 587dd21649078facc264203b834aebee56a204cc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 00:29:08 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit a14fa7cb9a1548d7f893c044c476316d49a49cc0. Reason for revert: puppet-postgresql 8.1.0 was released and now the module supports RHEL 9 (and CentOS 9 effectively). Note: This change adds the service_provider fact in test fact data because it is required by puppet-postgresql. Depends-on: https://review.opendev.org/850705 Change-Id: Id635b1467719576f4f6588c4245ce2c70e8f576c --- spec/classes/designate_db_postgresql_spec.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/classes/designate_db_postgresql_spec.rb b/spec/classes/designate_db_postgresql_spec.rb index 5bbb9d9d..1a458233 100644 --- a/spec/classes/designate_db_postgresql_spec.rb +++ b/spec/classes/designate_db_postgresql_spec.rb @@ -34,15 +34,13 @@ describe 'designate::db::postgresql' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :os_workers => 8, - :concat_basedir => '/var/lib/puppet/concat' + # puppet-postgresql requires the service_provider fact provided by + # puppetlabs-postgresql. + :service_provider => 'systemd' })) end - # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9 - unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9 - it_configures 'designate::db::postgresql' - end + it_configures 'designate::db::postgresql' end end end