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

This commit is contained in:
Zuul 2022-07-25 20:08:16 +00:00 committed by Gerrit Code Review
commit 09699ef632
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