From db307b6948397e06bb40c1427921ef473c941e07 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 00:50:19 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit 589205c8a5f22f1ddd9b5db94d4e09336c2b666b. 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: I8b110c5335c4fb0f69d25974228e12db0340222b --- spec/classes/neutron_db_postgresql_spec.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/classes/neutron_db_postgresql_spec.rb b/spec/classes/neutron_db_postgresql_spec.rb index 9629f3367..39246003c 100644 --- a/spec/classes/neutron_db_postgresql_spec.rb +++ b/spec/classes/neutron_db_postgresql_spec.rb @@ -34,15 +34,13 @@ describe 'neutron::db::postgresql' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :processorcount => 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_behaves_like 'neutron::db::postgresql' - end + it_behaves_like 'neutron::db::postgresql' end end end