From aff3a53d49155255d292861a44ad667d4388751e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 00:53:41 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit 83f966a8501c079d9e41edaa68e2e4e6b6838ced. 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: I2845d25c5f2de57e104d09284f0c5aedcd5d0362 --- spec/defines/openstacklib_db_postgresql_spec.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/defines/openstacklib_db_postgresql_spec.rb b/spec/defines/openstacklib_db_postgresql_spec.rb index 06b419ae..35923c55 100644 --- a/spec/defines/openstacklib_db_postgresql_spec.rb +++ b/spec/defines/openstacklib_db_postgresql_spec.rb @@ -88,13 +88,14 @@ describe 'openstacklib::db::postgresql' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts()) + facts.merge!(OSDefaults.get_facts({ + # 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_behaves_like 'openstacklib::db::postgresql examples' - end + it_behaves_like 'openstacklib::db::postgresql examples' end end end