Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"
This reverts commit 20fec07491
.
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: I912189bb54c0116b0c3df9f68cb96b1b9659de53
This commit is contained in:
parent
16ef701f4d
commit
befcc23b1d
|
@ -32,15 +32,13 @@ describe 'nova::db::postgresql_api' do
|
|||
context "on #{os}" do
|
||||
let (:facts) do
|
||||
facts.merge(OSDefaults.get_facts({
|
||||
:os_workers => 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_configures 'nova::db::postgresql'
|
||||
end
|
||||
it_configures 'nova::db::postgresql'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -50,15 +50,13 @@ describe 'nova::db::postgresql' do
|
|||
context "on #{os}" do
|
||||
let (:facts) do
|
||||
facts.merge(OSDefaults.get_facts({
|
||||
:os_workers => 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_configures 'nova::db::postgresql'
|
||||
end
|
||||
it_configures 'nova::db::postgresql'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue