From add08e3d57aeace8692f448b6e7e697d4b11e905 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 00:30:09 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit ae04e3ac34b152087f37d96836e2042c64c6d36d. 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: I6cfea1ca8dbf7633ea6b3805666237ec43533b4b --- spec/classes/glance_db_postgresql_spec.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/classes/glance_db_postgresql_spec.rb b/spec/classes/glance_db_postgresql_spec.rb index b1443299..7477684a 100644 --- a/spec/classes/glance_db_postgresql_spec.rb +++ b/spec/classes/glance_db_postgresql_spec.rb @@ -33,13 +33,14 @@ describe 'glance::db::postgresql' do }).each do |os,facts| context "on #{os}" do let (:facts) do - facts.merge!(OSDefaults.get_facts({ :concat_basedir => '/var/lib/puppet/concat' })) + 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_configures 'glance::db::postgresql' - end + it_configures 'glance::db::postgresql' end end end