Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"

This reverts commit ae04e3ac34.

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
This commit is contained in:
Takashi Kajinami 2022-07-24 00:30:09 +09:00
parent 47b92f3294
commit add08e3d57
1 changed files with 6 additions and 5 deletions

View File

@ -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